Merge branch 'master' of git://github.com/Indeed/phonegap into indeed

.classpath

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

AndroidManifest.xml

@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
       
     <application android:icon="@drawable/icon" android:label="@string/app_name"
     	android:debuggable="true">

assets/gap.js

@@ -4,7 +4,7 @@
  * website: http://phonegap.com
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
- * “Software”), to deal in the Software without restriction, including
+ * Software), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
@@ -13,7 +13,7 @@
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
  * 
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
@@ -284,16 +284,29 @@ var Device = {
         return Device.exec("vibrate")
     },
 
-		playSound: function(clip) {
-    	    xsound = "sound:";
-    	   if (Device.whatPlatform == "Android") {
-    		   xsound = "playSound";
-    		   return Device.exec(xsound + clip);
-    	   }
-    	
-			return Device.exec(xsound + clip);
+	playSound: function(clip) {
+   		xsound = "sound:";
+    	if (Device.whatPlatform == "Android") {
+    		xsound = "playSound";
+    		return Device.exec(xsound + clip);
+   		}
+    		return Device.exec(xsound + clip);
+	},
+	
+	notification: {
+		watchPosition: function(filter) {
+			window.DroidGap.notificationWatchPosition(filter);
+		}, 
+		clearWatch: function(filter) {
+			window.DroidGap.notificationClearWatch(filter);
+		} 
+	},
+	
+	http: {
+		get: function(url, file) {
+			window.DroidGap.httpGet(url, file);
 		}
-
+	}
 }
 
 function gotLocation(lat, lon) {
@@ -301,3 +314,4 @@ function gotLocation(lat, lon) {
     return Device.Location.set(lat, lon)
 }
 
+

assets/index.html

@@ -86,6 +86,31 @@ updateAccel = function(){
 }
 
 
+receiveSmsNotification = function(func)
+{
+   if (func == 'watchPosition') {
+       Device.notification.watchPosition('SMS');
+   } else
+   if (func == 'clearWatch') {
+       Device.notification.clearWatch('SMS');
+   }
+} 
+
+function onReceiveSms(number, message)
+{
+	$('number').value = number;
+	$('message').value = message;
+}
+
+http = function(func)
+{
+	if (func == 'get') {
+		Device.http.get($('httpGetUrl').value, $('httpGetFile').value)	
+	}
+}
+
+
+
 addLoadEvent(initGap);
 
 </script>
@@ -105,6 +130,8 @@ addLoadEvent(initGap);
         <li><a href="#vibration" onclick="Device.vibrate();">Vibration</a></li>
         <li><a href="#vibration" onclick="Device.playSound('on.mp3")">Play Sound</a></li>
         <li><a href="#photo" onclick="Device.Image.getFromPhotoLibrary();">Photo...</a></li>
+        <li><a href="#notification" onclick="notification();">Notification...</a></li>
+        <li><a href="#http" onclick="http();">HTTP...</a></li>
         <li><a href="http://phonegap.com/" target="_self">About</a></li>
     </ul>
     
@@ -218,6 +245,48 @@ addLoadEvent(initGap);
         </fieldset>
     </div>
     
+    <div id="notification" title="notification" class="panel">
+    	<h2>Notification</h2>
+    	<fieldset>
+    		<div class="row">
+    		<a class="button leftButton" type="submit" onclick="receiveSmsNotification('watchPosition');">startSmsListener</a>
+    		<a class="button blueButton" type="submit" onclick="receiveSmsNotification('clearWatch');">stopSmsListener</a>
+    		</div>
+    	</fieldset>
+    	<fieldset>
+    		<div class="row">
+    		<label>from:</label>
+    		<input disabled="enabled" id="number" type="text"></input>
+    		</div>
+    	</fieldset>
+    	<fieldset>
+    		<div class="row">
+    		<label>message:</label>
+    		<input disabled="enabled" id="message" type="text"></input>
+    		</div>
+    	</fieldset>
+    </div>
     
+    <div id="http" title="http" class="panel">
+    	<h2>HTTP</h2>
+    	<p><i>Make sure your Android sdk sdcard is mounted!</i></p>
+    	<fieldset>
+    		<div class="row">
+    		<a class="button leftButton" type="submit" onclick="http('get');">HTTP get remote_url</a>
+    		</div>
+    	</fieldset>
+    	<fieldset>
+    		<div class="row">
+    		<label>remote_url:</label>
+    		<input type=text name="httpGetUrl" id="httpGetUrl" size=60 maxlength=2048 value="http://hullomail.com/hulloworld.mp3" style="width: 30ex"></input>
+    		</div>
+    	</fieldset>
+    	<fieldset>
+    		<div class="row">
+    		<label>destination:</label>
+    		<input type=text name="httpGetFile" id="httpGetFile" size=60 maxlength=2048 value="/hullophonegap.mp3" style="width: 30ex"></input>
+    		</div>
+    	</fieldset>
+    </div>
     
-<div id="preloader"></div></body></html>
+<div id="preloader"></div></body></html>

src/com/nitobi/phonegap/HttpHandler.java

@@ -0,0 +1,65 @@
+package com.nitobi.phonegap;
+
+import java.io.EOFException;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+public class HttpHandler {
+
+	public Boolean get(String url, String file)
+	{
+		HttpEntity entity = getHttpEntity(url);
+		try {
+			writeToDisk(entity, file);
+		} catch (Exception e) { e.printStackTrace(); return false; }
+		try {
+			entity.consumeContent();
+		} catch (Exception e) { e.printStackTrace(); return false; }
+		return true;
+	}
+	
+	private HttpEntity getHttpEntity(String url)
+	/**
+	 * get the http entity at a given url
+	 */
+	{
+		HttpEntity entity=null;
+		try {
+			DefaultHttpClient httpclient = new DefaultHttpClient();
+			HttpGet httpget = new HttpGet(url);
+			HttpResponse response = httpclient.execute(httpget);
+			entity = response.getEntity();
+		} catch (Exception e) { e.printStackTrace(); return null; }
+		return entity;
+	}
+	
+	private void writeToDisk(HttpEntity entity, String file) throws EOFException
+	/**
+	 * writes a HTTP entity to the specified filename and location on disk
+	 */
+	{  
+		int i=0;
+		String FilePath="/sdcard/" + file;
+		try {
+			InputStream in = entity.getContent();
+			byte buff[] = new byte[1024];    
+			FileOutputStream out=
+				new FileOutputStream(FilePath);
+			do {
+				int numread = in.read(buff);
+				if (numread <= 0)
+                   	break;
+				out.write(buff, 0, numread);
+				System.out.println("numread" + numread);
+				i++;
+			} while (true);
+			out.flush();
+			out.close();	
+		} catch (Exception e) { e.printStackTrace(); }
+	}
+}

src/com/nitobi/phonegap/PhoneGap.java

@@ -4,7 +4,7 @@ package com.nitobi.phonegap;
  * website: http://phonegap.com
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
- * “Software”), to deal in the Software without restriction, including
+ * Software), to deal in the Software without restriction, including
  * without limitation the rights to use, copy, modify, merge, publish,
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
@@ -13,7 +13,7 @@ package com.nitobi.phonegap;
  * The above copyright notice and this permission notice shall be
  * included in all copies or substantial portions of the Software.
  * 
- * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+ * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
  * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
@@ -24,17 +24,14 @@ package com.nitobi.phonegap;
 import java.io.IOException;
 
 import android.content.Context;
+import android.content.IntentFilter;
 import android.hardware.SensorManager;
 import android.location.Location;
-import android.location.LocationManager;
-import android.location.LocationListener;
 import android.location.LocationProvider;
 import android.media.MediaPlayer;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.Vibrator;
 import android.telephony.TelephonyManager;
-import android.util.Log;
 import android.webkit.WebView;
 
 public class PhoneGap{
@@ -51,6 +48,7 @@ public class PhoneGap{
     private GpsListener mGps;
     private NetworkListener mNetwork;
     protected LocationProvider provider;
+    SmsListener mSmsListener;
     
 	public PhoneGap(Context ctx, Handler handler, WebView appView) {
         this.mCtx = ctx;
@@ -58,6 +56,7 @@ public class PhoneGap{
         this.mAppView = appView;
         mGps = new GpsListener(ctx);
         mNetwork = new NetworkListener(ctx);
+        mSmsListener = new SmsListener(ctx,mAppView);
     }
 	
 	public void updateAccel(){
@@ -155,11 +154,7 @@ public class PhoneGap{
 				mp.prepare();
 				mp.start();
 			}
-			
-            
-            
-			 
-			
+
 			//mp.setDataSource("file:///android_asset/" + filename);
 			//mp.setDataSource("http://ventrix.nsdc.gr/stuff/TERMITES_SKONH.mp3");
 			mp.prepare();
@@ -214,5 +209,40 @@ public class PhoneGap{
 		return version;
 	}	
 	
+	public void notificationWatchPosition(String filter)
+	/**
+	 * Starts the listener for incoming notifications of type filter
+	 * TODO: JavaScript Call backs for success and error handling. More filter types. 
+	 */
+	{
+		if (filter.contains("SMS"))
+		{
+    		IntentFilter mFilter = new IntentFilter("android.provider.Telephony.SMS_RECEIVED");
+    		mCtx.registerReceiver(mSmsListener,mFilter);
+		}
+	}
 	
+    public void notificationClearWatch(String filter) 
+	/**
+	 * Stops the listener for incoming notifications of type filter
+	 * TODO: JavaScript Call backs for success and error handling 
+	 */
+    {
+    	if (filter.contains("SMS")) 
+    	{
+    		mCtx.unregisterReceiver(mSmsListener);
+    	}	
+    }
+    
+    public void httpGet(String url, String file)
+    /**
+     * grabs a file from specified url and saves it to a name and location
+     * the base directory /sdcard is abstracted so that paths may be the same from one mobile OS to another
+     * TODO: JavaScript call backs and error handling
+     */
+    {
+    	HttpHandler http = new HttpHandler();
+    	http.get(url, file);
+    }
 }
+

src/com/nitobi/phonegap/SmsListener.java

@@ -0,0 +1,68 @@
+package com.nitobi.phonegap;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.gsm.SmsMessage;
+import android.util.Log;
+import android.webkit.WebView;
+
+public class SmsListener extends BroadcastReceiver 
+{
+	private WebView mAppView;
+	
+	public SmsListener(Context ctx, WebView mAppView) 
+	{
+        this.mAppView = mAppView;
+	}
+
+    String ACTION = "android.provider.Telephony.SMS_RECEIVED"; 
+  	
+    public void onReceive(Context ctx, Intent intent) 
+    {
+    	SmsMessage[] msg;
+    	if (intent.getAction().equals(ACTION))         	
+    	{
+    		msg = getMessagesFromIntent(intent);
+    		String smsContent = null;
+    		String sendersNumber = null;
+    		for(int i=0; i < msg.length; i++)
+    		{
+    			sendersNumber = msg[i].getDisplayOriginatingAddress();
+    			smsContent = msg[i].getDisplayMessageBody();
+    		}
+                onReceiveSMS(sendersNumber, smsContent);
+        }
+    }
+        
+    public void onReceiveSMS(String sendersNumber, String smsContent) 
+    /**
+     * Call back to Java Script
+     */
+    {
+    	mAppView.loadUrl("javascript:onReceiveSms('"+sendersNumber+"',"+"'"+ smsContent +"'"+")");
+    }
+        
+    private SmsMessage[] getMessagesFromIntent(Intent intent)
+    {
+    	SmsMessage retMsgs[] = null;
+    	Bundle bdl = intent.getExtras();
+    	try
+    	{
+    		Object pdus[] = (Object [])bdl.get("pdus");
+    		retMsgs = new SmsMessage[pdus.length];
+    		for(int n=0; n < pdus.length; n++)
+    		{
+    			byte[] byteData = (byte[])pdus[n];
+    			retMsgs[n] = SmsMessage.createFromPdu(byteData);
+    		}                              
+        } catch(Exception e)
+            {
+                Log.e("SMS_getMessagesFromIntent", "fail", e);
+            }
+            return retMsgs;
+    }
+
+}
+