From 448eafecd8b76d8294e7aa465a97f82a09b21c25 Mon Sep 17 00:00:00 2001
From: Nir Yariv <niryariv@gmail.com>
Date: Tue, 18 Jan 2011 13:57:34 -0500
Subject: [PATCH] Move post-parse sms sending to TargetUrlRequest

---
 src/kalsms/niryariv/itp/SMSReceiver.java      | 15 +-----------
 src/kalsms/niryariv/itp/SMSSender.java        | 16 +------------
 src/kalsms/niryariv/itp/TargetUrlRequest.java | 24 ++++++++++++++++++-
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/kalsms/niryariv/itp/SMSReceiver.java b/src/kalsms/niryariv/itp/SMSReceiver.java
index 265155b..9791d50 100644
--- a/src/kalsms/niryariv/itp/SMSReceiver.java
+++ b/src/kalsms/niryariv/itp/SMSReceiver.java
@@ -9,7 +9,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.telephony.SmsManager;
 import android.telephony.SmsMessage;
 import android.util.Log;
 
@@ -47,19 +46,7 @@ public class SMSReceiver extends BroadcastReceiver {
 				// SMS back the response
 				if (resp.trim().length() > 0) {
 					ArrayList<ArrayList<String>> items = url.parseXML(resp);
-					
-					SmsManager smgr = SmsManager.getDefault();
-					for (int j = 0; j < items.size(); j++) {
-						String sendTo = items.get(j).get(0);
-						if (sendTo.toLowerCase() == "sender") sendTo = sender;
-						String sendMsg = items.get(j).get(1);
-						try {
-							Log.d("KALSMS", "SEND MSG:\"" + sendMsg + "\" TO: " + sendTo);
-							smgr.sendTextMessage(sendTo, null, sendMsg, null, null);
-						} catch (Exception ex) {
-							Log.d("KALSMS", "SMS FAILED");
-						}
-					}
+					url.sendMessages(items);
 				}
 				// delete SMS from inbox, to prevent it from filling up
 				DeleteSMSFromInbox(context, mesg);
diff --git a/src/kalsms/niryariv/itp/SMSSender.java b/src/kalsms/niryariv/itp/SMSSender.java
index 96940df..774084c 100755
--- a/src/kalsms/niryariv/itp/SMSSender.java
+++ b/src/kalsms/niryariv/itp/SMSSender.java
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
-import android.telephony.SmsManager;
 import android.util.Log;
 
 public class SMSSender extends BroadcastReceiver {
@@ -33,20 +32,7 @@ public class SMSSender extends BroadcastReceiver {
 		// SMS back the response
 		if (resp.trim().length() > 0) {
 			ArrayList<ArrayList<String>> items = url.parseXML(resp);
-			
-			SmsManager smgr = SmsManager.getDefault();
-			
-			for (int j = 0; j < items.size(); j++) {
-				String sendTo = items.get(j).get(0);
-				String sendMsg = items.get(j).get(1);
-				
-				try {
-					Log.d("KALSMS", "SEND MSG:\"" + sendMsg + "\" TO: " + sendTo);
-					smgr.sendTextMessage(sendTo, null, sendMsg, null, null);
-				} catch (Exception ex) {
-					Log.d("KALSMS", "SMS FAILED");
-				}
-			}
+			url.sendMessages(items);
 		}
 		wake.release();
 	}
diff --git a/src/kalsms/niryariv/itp/TargetUrlRequest.java b/src/kalsms/niryariv/itp/TargetUrlRequest.java
index e1e8d92..f891d0e 100644
--- a/src/kalsms/niryariv/itp/TargetUrlRequest.java
+++ b/src/kalsms/niryariv/itp/TargetUrlRequest.java
@@ -22,12 +22,17 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 
+import android.telephony.SmsManager;
 import android.util.Log;
 
 public class TargetUrlRequest {
 	
+	private String sender = "";
+	
 	public String openURL(String sender, String message, String targetUrl, Boolean isPollRequest) {
 		
+		this.sender = sender;
+		
 		List<NameValuePair> qparams = new ArrayList<NameValuePair>();
         
 		if(sender.trim().length() > 0 && message.trim().length() > 0) {
@@ -105,5 +110,22 @@ public class TargetUrlRequest {
             e.printStackTrace();
             return (output);
         }
-    }	
+    }
+	
+	public void sendMessages(ArrayList<ArrayList<String>> items) { 
+		SmsManager smgr = SmsManager.getDefault();
+		for (int j = 0; j < items.size(); j++) {
+			String sendTo = items.get(j).get(0);
+			if (sendTo.toLowerCase() == "sender") sendTo = this.sender;
+			String sendMsg = items.get(j).get(1);
+			try {
+				Log.d("KALSMS", "SEND MSG:\"" + sendMsg + "\" TO: " + sendTo);
+				smgr.sendTextMessage(sendTo, null, sendMsg, null, null);
+			} catch (Exception ex) {
+				Log.d("KALSMS", "SMS FAILED");
+			}
+		}
+	}
+	
 }
+