From 41141fa5fd27ca8883a3ba5fbbca5ab49b6dab9e Mon Sep 17 00:00:00 2001
From: Jesse Young <youngj@envaya.org>
Date: Tue, 13 Sep 2011 18:26:17 -0700
Subject: [PATCH] add menu option to forward existing messages from inbox
 (delivered when kalsms was not enabled)

---
 AndroidManifest.xml                        |   4 ++
 res/drawable-hdpi/ic_menu_dialog.png       | Bin 0 -> 1788 bytes
 res/drawable-ldpi/ic_menu_dialog.png       | Bin 0 -> 944 bytes
 res/drawable-mdpi/ic_menu_dialog.png       | Bin 0 -> 1134 bytes
 res/layout/inbox.xml                       |  18 ++++++
 res/layout/inbox_item.xml                  |  31 +++++++++
 res/menu/mainmenu.xml                      |  10 ++-
 res/values/strings.xml                     |   1 +
 src/org/envaya/kalsms/ForwardInbox.java    |  69 +++++++++++++++++++++
 src/org/envaya/kalsms/Help.java            |   2 +-
 src/org/envaya/kalsms/IncomingMessage.java |  22 +++++--
 src/org/envaya/kalsms/Main.java            |   5 +-
 src/org/envaya/kalsms/Prefs.java           |   9 +--
 13 files changed, 152 insertions(+), 19 deletions(-)
 create mode 100755 res/drawable-hdpi/ic_menu_dialog.png
 create mode 100755 res/drawable-ldpi/ic_menu_dialog.png
 create mode 100755 res/drawable-mdpi/ic_menu_dialog.png
 create mode 100755 res/layout/inbox.xml
 create mode 100755 res/layout/inbox_item.xml
 create mode 100755 src/org/envaya/kalsms/ForwardInbox.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2e41cf2..eca7b0a 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -23,6 +23,10 @@
         <activity android:name=".Help" android:label="@string/app_name">
         </activity>        
         
+        <activity android:name=".ForwardInbox" android:label="@string/app_name">
+        </activity>        
+        
+        
         <receiver android:name=".IncomingMessageForwarder">
             <intent-filter android:priority="101">
                 <action android:name="android.provider.Telephony.SMS_RECEIVED" />
diff --git a/res/drawable-hdpi/ic_menu_dialog.png b/res/drawable-hdpi/ic_menu_dialog.png
new file mode 100755
index 0000000000000000000000000000000000000000..ee6e6854c34dc8e8b94b12170ed7da667394ce51
GIT binary patch
literal 1788
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

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/ic_menu_dialog.png b/res/drawable-ldpi/ic_menu_dialog.png
new file mode 100755
index 0000000000000000000000000000000000000000..efa71eaaeef75068d785f4dd41c224aa2c12f160
GIT binary patch
literal 944
zcmV;h15f;kP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H111(8JK~z|U?UheR6mb;Czi(!ob$;&7jva!Tm2eLpJXBV8lVvHo
zcal1I2ns6j5(piVt_qR2JZp53@X$?&hy+POwnK+VT7?pK6-3q*_s?(Ubx^~$nRUlM
zUD_|q<^ATp-)G)@-|q)B)l^fbD>|VXTF9Jgy<$h!@bK`pjg5^lRaMW2sKo#>U0q%G
z2L}f~)h>qpvV)>xvG^<+jb5-UD^%X*=H}&GE;k0C?<9fPw(Xu|G6|w^jb>(Kv)Nw1
zwc`MxqoacqMe*H`nd{~{j^i6YG7vNC3kwT{S|BN<C=?1>p-@1z8t7f<x_+`iL{wqs
zv$f$&CUZ^*F{EkQt$aQo^*k?B-NS(DnuCZcwJ~O11n_WXW@d$%pN0kU-Ed@N<m$@G
z%8N>+a)p^2ax4*XOH0e=wzjrMqobqmr>3UPRIAk=p67{xl=8s9Kx=K#w?p}SeoRW)
z8;ivno*-tX?d|PLTU%St0bJ?t@86i1m{<gG(FY#7t`jp85&hwQUm(LUdb_*3p=seP
z=DIGHmzR66d-#Efh?#Nlw<(H(NF)N&G#3G=0OY|Mf6puc+qR*q>hJMw^idQAwrvvt
zFmp>XnT#b82~Sm3c%BDlMm!$(9LM=$7{(I-e;LfT1+A^E2y4cDMIsUGb*IYA-I+|L
zS4#P2b#?WOloC5TJFois`tAX!5>aD7M}?^s5tW(w<NW;mZP#^Q=W@9ifNuaQwchzB
zKzmRwGryago4ez>?n^0Uw%+@Ju01N0-&I0Hl9}Jk&dxqqUtj+m)E!?SW>zLACria*
zF%lL^Q4|OvO3bX(`eV;iFR?d)fi-+$WEjRwdwV<fr(=IYh$!$;RTc4g9Hwc$MZkee
zL|(n_06rZeB6oUvdPoQ%iRk9q+L~Zy2qDnf*}1LjdfBg#=XqYaT>ik!kKr@UjVkaM
zW@c@Ce0;oAD%}-AAdyHcnWlLol}i1rQ_lt99@d3=s&^E-nx=gfLcnpHB_YK1R4TQ6
zoXw641k19%8-|gMMx!^<>GY|?00CDAuzP!3mNh4YNT<{3rGEj_R8vj;m-+>l%5&N@
S9j&SW0000<MNUMnLSTZ`U$5N&

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_menu_dialog.png b/res/drawable-mdpi/ic_menu_dialog.png
new file mode 100755
index 0000000000000000000000000000000000000000..48a3851bd302c1107791f9fa804e137458a5d610
GIT binary patch
literal 1134
zcmV-!1d;oRP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11M5jdK~!jg?U+qZ<5m=g-(%-GaU2up3rdJo5DS<^f53=M7qI9O
z{y<j+p+Txxbkj|LKqWR%AeE3>G5anM0@O`+ElXyEh8YP7p)P`=d=eC#)IME+5t_!q
zN(@6KKhj-9zCP!?etqxp4G<6z5D*aXKZg7ame1!!yWL*6xVTuVR4Nm;ZTB2Yk|ZP&
ziT6W8Lu*2a{KCRQyVJZ-&lx&k+x9nSXJ@OHWkCqhcf3ZUG0|)`S4T%j0bs4u9A5>L
zN~NV_GKowk15MLF)VsmVjH|0F6pKZaN~KqL3IXA8_{GS`2oy!>t9S=RQJ`rW&d<*$
z-RAfzAe~O%y*kY7OH3gI1_uXSuS>pU0l>@@i^V)WdE2%<4`zm@X|A#SbU+Lb4?~jN
zpNVbTFijKndL8X{+ZUJo6wscUnu>I}PKSqwp9A>HFpTfZ<#MLgYW1DeHvvS%0L*T4
znE3;M)1#xK->$E(|7x{bpY`j4tAKnyFB*-;e6d(us@Ln2{UjnH3=9mMtgNi8#bU9a
z=jZ4DE))tsFmwLV1XQclh4b_CRm-yaN&wvKNY!d}^78U>ZES3e0c?aqq2K+8?JA&L
zF2719lSrjfzBQ#%sf0?UvP4Ad%zU=Jz1?$62iGk_QIyGCE{AwL4j}|Wp-|652!VJ!
zj$AGWMNwV=H*3c0HY$VwGk2`j)qzYV^C(RznM~gOekd*xfry~0>RY&cc)B{^G!JI>
zZ2&+t8g=55BuS7Y2}JatxkQ9WBm%=Q5RFD(yVdFH!2P6;gve&IkR%DUS`D>Y4bGw_
zBFC-wMD%Mmn_VZOjw`;afJdf1Jv|)(5IQ(G_|dlQ#d^IC%d)`Cux<O#nVFd{0a$Lu
z16>64a~Sc$y~bxU^YZ@wKA3sYae|260chXObLCSya0d~Y%)Gp}w|6H3z=@Z8KbZp`
z<A~VZ-32o*3L*Lv@RSZXI3jj-cI<FC{Km^Y9R)D6w6(Pb(=>e*LPQ9M!(e8Kh&oz)
zE8<%K_CxPK;O+oLB9XVIX@23?cIq^xNF?Igl<v*-{E_6^$aGzQol2#ks;X<FaT?J>
zLzZQzs)|%91zp!&n^G@ybbyGg<KyG?)6-K~Rn@Nxg~CL$*}QW?mSrRo2^faq`6JJ^
z?GMcS%lP=XYg6iluGyJc1|V;4ZvN41HeUia#T$kJUDr2eXJ@|y@Q=q_j0c)hFLXVT
z5s}5rHh_1`{PLsXmx-wB3G6BG^sj_0%O_6pu~_Wc6c2bj6Kk4wq9_V<UEi3Sn|n6J
z10Eenr_*mVP5bG&74I2lrrQM_5D*X$5b&({7bfaAkBp8J-T(jq07*qoM6N<$f-QFk
AEdT%j

literal 0
HcmV?d00001

diff --git a/res/layout/inbox.xml b/res/layout/inbox.xml
new file mode 100755
index 0000000..9bd2a9b
--- /dev/null
+++ b/res/layout/inbox.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+         android:orientation="vertical"
+         android:layout_width="fill_parent"
+         android:layout_height="fill_parent"
+         android:paddingLeft="8dp"
+         android:paddingRight="8dp">
+     <ListView android:id="@android:id/list"
+               android:layout_width="fill_parent"
+               android:layout_height="fill_parent"
+               android:layout_weight="1"
+               android:drawSelectorOnTop="false"/>
+    <Button
+         android:layout_height="wrap_content"
+         android:layout_width="wrap_content"
+         android:text="Forward selected"
+         android:onClick="forwardSelected" />         
+ </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/inbox_item.xml b/res/layout/inbox_item.xml
new file mode 100755
index 0000000..4c2b669
--- /dev/null
+++ b/res/layout/inbox_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" 
+    android:layout_marginBottom="6sp"
+    android:background="#cccccc">      
+<CheckBox android:id="@+id/inbox_checkbox"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />            
+<LinearLayout
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">      
+<TextView 
+    android:id="@+id/inbox_address" 
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"     
+    android:textColor="#333333" 
+    android:layout_marginTop="4sp"
+    android:layout_marginLeft="6sp"
+    android:textSize="14sp"></TextView>    
+<TextView 
+    android:id="@+id/inbox_body"     
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"     
+    android:textColor="#666666" 
+    android:layout_marginLeft="6sp"
+    android:textSize="14sp"></TextView>
+</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/menu/mainmenu.xml b/res/menu/mainmenu.xml
index 4242500..8c7c0f9 100755
--- a/res/menu/mainmenu.xml
+++ b/res/menu/mainmenu.xml
@@ -9,10 +9,14 @@
     <item android:id="@+id/check_now"
             android:icon="@drawable/ic_menu_tick"
           android:title="@string/check_now" />          
-    <item android:id="@+id/help"
-            android:icon="@drawable/ic_menu_puzzle"
-          android:title="@string/help" />                    
+    <item android:id="@+id/forward_inbox"
+            android:icon="@drawable/ic_menu_dialog"
+          android:title="@string/forward_inbox" />                    
     <item android:id="@+id/retry_now"
             android:icon="@drawable/ic_menu_magnet"
           android:title="@string/retry_now" />          
+    <item android:id="@+id/help"
+            android:icon="@drawable/ic_menu_puzzle"
+          android:title="@string/help" />                    
+          
 </menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 00fd2e7..3165203 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6,4 +6,5 @@
     <string name="check_now">Check Messages</string>
     <string name="help">Help</string>
     <string name="retry_now">Retry</string>
+    <string name="forward_inbox">Fwd Inbox...</string>
 </resources>
diff --git a/src/org/envaya/kalsms/ForwardInbox.java b/src/org/envaya/kalsms/ForwardInbox.java
new file mode 100755
index 0000000..7f9226e
--- /dev/null
+++ b/src/org/envaya/kalsms/ForwardInbox.java
@@ -0,0 +1,69 @@
+
+package org.envaya.kalsms;
+
+import android.app.ListActivity;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ListView;
+import android.widget.SimpleCursorAdapter;
+import android.widget.TextView;
+
+
+public class ForwardInbox extends ListActivity {
+
+    private App app;    
+    
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        
+        app = App.getInstance(getApplicationContext());
+                
+        setContentView(R.layout.inbox);
+                
+        // undocumented API; see
+        // core/java/android/provider/Telephony.java
+        
+        Uri inboxUri = Uri.parse("content://sms/inbox");
+        
+        Cursor cur = getContentResolver().query(inboxUri, null, null, null, null);
+        
+        SimpleCursorAdapter adapter = new SimpleCursorAdapter(this,
+            R.layout.inbox_item,
+            cur, 
+            new String[] {"address","body"}, 
+            new int[] {R.id.inbox_address, R.id.inbox_body}); 
+        
+        setListAdapter(adapter);                                
+    }
+           
+    public void forwardSelected(View view) {
+        
+        ListView listView = getListView();        
+        
+        // there is probably a less hacky way to do this...
+        int childCount = listView.getChildCount();                
+        for (int i = 0; i < childCount; i++)
+        {
+            View entry = listView.getChildAt(i);            
+            CheckBox checkbox = (CheckBox) entry.findViewById(R.id.inbox_checkbox);
+
+            if (checkbox.isChecked())
+            {
+                TextView addressView = (TextView) entry.findViewById(R.id.inbox_address);
+                TextView bodyView = (TextView) entry.findViewById(R.id.inbox_body);
+                IncomingMessage sms = new IncomingMessage(app, 
+                        addressView.getText().toString(), 
+                        bodyView.getText().toString());                
+                
+                app.forwardToServer(sms);
+            }
+        }
+        
+        this.finish();
+     }              
+}
diff --git a/src/org/envaya/kalsms/Help.java b/src/org/envaya/kalsms/Help.java
index 9c43ff5..1e67c8e 100755
--- a/src/org/envaya/kalsms/Help.java
+++ b/src/org/envaya/kalsms/Help.java
@@ -42,7 +42,7 @@ public class Help extends Activity {
     
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        startActivity(new Intent(this, Main.class));
+        this.finish();
         
         return(true);
     }    
diff --git a/src/org/envaya/kalsms/IncomingMessage.java b/src/org/envaya/kalsms/IncomingMessage.java
index 73a09d4..1807c86 100755
--- a/src/org/envaya/kalsms/IncomingMessage.java
+++ b/src/org/envaya/kalsms/IncomingMessage.java
@@ -7,30 +7,40 @@ import org.apache.http.message.BasicNameValuePair;
 
 public class IncomingMessage extends QueuedMessage {
 
-    public SmsMessage sms;
+    public String from;
+    public String message;
+    public long timestampMillis = 0;    
 
     public IncomingMessage(App app, SmsMessage sms) {
         super(app);
-        this.sms = sms;
+        this.from = sms.getOriginatingAddress();
+        this.message = sms.getMessageBody();
+        this.timestampMillis = sms.getTimestampMillis();
     }
+    
+    public IncomingMessage(App app, String from, String message) {
+        super(app);
+        this.from = from;
+        this.message = message;
+    }    
 
     public String getMessageBody()
     {
-        return sms.getMessageBody();
+        return message;
     }
     
     public String getFrom()
     {
-        return sms.getOriginatingAddress();
+        return from;
     }
     
     public String getId() 
     {
-        return sms.getOriginatingAddress() + ":" + sms.getMessageBody() + ":" + sms.getTimestampMillis();
+        return from + ":" + message + ":" + timestampMillis;
     }    
     
     public void retryNow() {
-        app.log("Retrying forwarding SMS from " + sms.getOriginatingAddress());
+        app.log("Retrying forwarding SMS from " + from);
         tryForwardToServer();
     }
 
diff --git a/src/org/envaya/kalsms/Main.java b/src/org/envaya/kalsms/Main.java
index 644135a..fc447b1 100755
--- a/src/org/envaya/kalsms/Main.java
+++ b/src/org/envaya/kalsms/Main.java
@@ -132,7 +132,10 @@ public class Main extends Activity {
             return true;
         case R.id.retry_now:
             app.retryStuckMessages();
-            return true;           
+            return true; 
+        case R.id.forward_inbox:
+            startActivity(new Intent(this, ForwardInbox.class));
+            return true;
         case R.id.help:
             startActivity(new Intent(this, Help.class));
             return true;
diff --git a/src/org/envaya/kalsms/Prefs.java b/src/org/envaya/kalsms/Prefs.java
index de1c98a..b46ff71 100755
--- a/src/org/envaya/kalsms/Prefs.java
+++ b/src/org/envaya/kalsms/Prefs.java
@@ -93,17 +93,10 @@ public class Prefs extends PreferenceActivity implements OnSharedPreferenceChang
         }
     }    
 
-    // first time the Menu key is pressed
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        startActivity(new Intent(this, Prefs.class));
-        return (true);
-    }
-
     // any other time the Menu key is pressed
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        startActivity(new Intent(this, Prefs.class));
+        this.finish();
         return (true);
     }
 }