--- android/SmsSend/src/dk/thoerup/smssend/SmsSend.java	2010/05/25 13:54:28	745
+++ android/SmsSend/src/dk/thoerup/smssend/SmsSend.java	2010/05/26 07:44:39	751
@@ -1,13 +1,21 @@
 package dk.thoerup.smssend;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 
-import android.R.bool;
 import android.app.Activity;
+import android.app.ProgressDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.ContactsContract;
 import android.telephony.SmsManager;
@@ -31,6 +39,9 @@
 	final String SMSDAEMON = "42407617";
 	
 	final int OPTIONS_SETTINGS = 1000;
+	
+	final int LOOKUP_PHONENR = 2000;
+	
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -80,20 +91,30 @@
 		return retval;
 		
 	}
+	
+	
 
-	void lookup() {
-		/*
-		Intent intent = new Intent(Intent.ACTION_PICK, People.CONTENT_URI);
-
-        startActivityForResult(intent, 1);
-		 */
+	@Override
+	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+		super.onActivityResult(requestCode, resultCode, data);
+		
+		switch(requestCode) {
+		case LOOKUP_PHONENR:
+			if (resultCode == Activity.RESULT_OK) {
+				String phone = data.getStringExtra("phone");
+				EditText dest = (EditText) findViewById(R.id.destination);
+				dest.setText(phone);				
+			}
+			break;
+		}
+	}
 
+	void lookup() {
 		
         Intent intent = new Intent(Intent.ACTION_PICK);
-        intent.setType(ContactsContract.Contacts.CONTENT_TYPE);
-
+        intent.setType(ContactsContract.CommonDataKinds.Phone.CONTENT_TYPE);
 
-        startActivityForResult(intent, 1);
+        startActivityForResult(intent, LOOKUP_PHONENR);
 		
 
 
@@ -144,30 +165,8 @@
 	OnClickListener sendListener = new OnClickListener() {
 		@Override
 		public void onClick(View v) {
-			Spinner method = (Spinner) findViewById(R.id.method);
-			int sel = method.getSelectedItemPosition();
-			
-			boolean ret = false; 
-
-			switch (sel) {
-			case 0:
-				ret = sendInternal();
-				break;
-			case 1:
-				ret = sendCoolSms();
-				break;
-			case 2:
-				ret = sendSmsDaemon();
-				break;						
-
-			}
-
-			String msg = "Done!";
-			if (ret == false)
-				msg = "failed!";
-			
-			Toast.makeText(SmsSend.this, msg, Toast.LENGTH_LONG).show();
-
+			SendWorker worker = new SendWorker();
+			worker.execute();
 		}
 	};
 
@@ -217,11 +216,20 @@
 
 		for (int i=0; i<count; i++) {
 			sms.sendMultipartTextMessage(to, null, parts, null, null);
+			sleep(5000); //give the phone some time to send the message
 		}
 		
 		return true;
 	}
 	
+	void sleep(int s) {
+		try {
+			Thread.sleep(s);
+		} catch (InterruptedException e) {
+			Log.e("SmsSend", "Sleep interrupted", e);
+		}
+	}
+	
 	boolean isNumeric(String str) {
 		for (int i=0; i<str.length(); i++) {
 			char c = str.charAt(i);
@@ -231,6 +239,14 @@
 		
 		return true;
 	}
+	
+	String encode(String url) {
+		try {
+			return URLEncoder.encode(url, "UTF-8");
+		} catch (Exception e) {
+			return url;
+		}
+	}
 
 	boolean sendCoolSms() {
 		SharedPreferences prefs = this.getSharedPreferences("SmsSend", MODE_PRIVATE);
@@ -248,29 +264,51 @@
 		}
 		
 		//"http://sms.coolsmsc.dk:8080/?username=%s&password=%s&to=%s&from=SMS+HTTP+GW&message=hello+world"
+		
+		String url = "http://sms.coolsmsc.dk:8080/";
+		
 		StringBuilder sb = new StringBuilder();
-		sb.append("http://sms.coolsmsc.dk:8080/");
-		sb.append("?username=").append(user);
+		sb.append("username=").append(user);
 		sb.append("&password=").append(pass);
 		sb.append("&to=").append( getTo() );
-		sb.append("&from=").append( getFrom() );
-		sb.append("&message=").append( getMessage() );
+		sb.append("&from=").append( encode(getFrom()) );
+		sb.append("&message=").append( encode(getMessage()) );
+		sb.append("&resulttype=urlencoded");
+		sb.append("&lang=en");
 		
 		Log.v("SmsSend", sb.toString());
 		
+		
+		boolean success = false;
+		String msg = "";
 		try {
-			URL u = new URL( sb.toString() );
-			URLConnection conn =  u.openConnection();
-			conn.getInputStream();
+			byte bytes[] = postContent(url,  sb.toString(), 2500 );
+			String res = new String(bytes);
+			String parts[] = res.split("&");
+			
+			for (String part : parts) {
+				String pair[] = part.split("=");
+				if (pair[0].equals("status")) {
+					if (pair[1].equals("success")) {
+						success = true;
+					} else {
+						success = false;
+					}
+				}
+				
+				if (pair[0].equals("result")) {
+					msg = URLDecoder.decode(pair[1]);
+				}
+			}
 			
 			
 			
 		} catch (Exception e) {
 			Log.e("SmsSend", "sendCoolSms", e);
-			return false;
+			success = false;
 		}
 		
-		return true;
+		return success;
 	}
 
 	boolean sendSmsDaemon() {
@@ -289,6 +327,64 @@
 
 		return true;
 	}
+	
+	
+	public static byte[] getContent(String uri, int timeout) throws IOException {
+		byte buffer[] = new byte[256];
+		
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(32768); //start buffer size - instead of default 32bytes
+		
+		URL url = new URL(uri);
+		URLConnection connection = url.openConnection();
+		HttpURLConnection c;
+		connection.setConnectTimeout(timeout);
+		InputStream is = connection.getInputStream();
+		
+		try {
+			int count;
+			while ( (count = is.read(buffer)) != -1) {
+				baos.write(buffer, 0, count);
+			}
+		} finally {
+			try {
+				is.close();
+				baos.close();
+			} catch (Exception e) {} //never mind if close throws an exception
+		}
+				
+		return baos.toByteArray();
+	}
+	
+	public static byte[] postContent(String uri, String data,  int timeout) throws IOException {
+		byte buffer[] = new byte[256];
+		
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(32768); //start buffer size - instead of default 32bytes
+		
+		URL url = new URL(uri);
+		HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+		connection.setDoOutput(true);
+		connection.setRequestMethod("POST");		
+		connection.setConnectTimeout(timeout);
+		
+		OutputStream os = connection.getOutputStream();
+		os.write( data.getBytes() );
+		
+		InputStream is = connection.getInputStream();
+		
+		try {
+			int count;
+			while ( (count = is.read(buffer)) != -1) {
+				baos.write(buffer, 0, count);
+			}
+		} finally {
+			try {
+				is.close();
+				baos.close();
+			} catch (Exception e) {} //never mind if close throws an exception
+		}
+				
+		return baos.toByteArray();
+	}
 
 	OnItemSelectedListener methodSelected = new OnItemSelectedListener() {
 		public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) {
@@ -316,5 +412,58 @@
 			
 		}		
 	};
+	
+	class SendWorker extends AsyncTask<Void, Void, Void> {
+
+		boolean ret;
+		ProgressDialog dlg; 
+
+		@Override
+		protected void onPreExecute() {
+			super.onPreExecute();			
+			
+			dlg = new ProgressDialog(SmsSend.this);			
+			dlg.setMessage( "Sending" );
+			dlg.setCancelable(true);
+			dlg.show();
+
+			ret = false;
+		}
+
+		@Override
+		protected Void doInBackground(Void... params) {
+			Spinner method = (Spinner) findViewById(R.id.method);
+			int sel = method.getSelectedItemPosition();
+			
+
+			switch (sel) {
+			case 0:
+				ret = sendInternal();
+				break;
+			case 1:
+				ret = sendCoolSms();
+				break;
+			case 2:
+				ret = sendSmsDaemon();
+				break;						
+
+			}
+		
+			return null;
+		}
+		
+		@Override
+		protected void onPostExecute(Void result) {
+			dlg.dismiss();
+			dlg = null;
+			
+			String msg = "Done!";
+			if (ret == false)
+				msg = "failed!";
+
+			Toast.makeText(SmsSend.this, msg, Toast.LENGTH_LONG).show();
+		}
+		
+	}
 
-}
\ No newline at end of file
+}