Merge branch 'master' of git://github.com/phonegap/phonegap-android

Upping version to 1.0.0rc3
2026-01-30 00:05:28 +08:00 · 2011-07-26 00:31:37 -04:00 · 2011-07-26 12:30:41 +08:00 · 2011-07-26 00:20:35 -04:00 · 2011-07-26 00:18:33 -04:00 · 2011-07-26 12:18:04 +08:00
66 changed files with 5923 additions and 3574 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
+.DS_Store
 default.properties
 gen
 assets/www/phonegap.js
 local.properties
 framework/phonegap.jar
+framework/phonegap-*.jar
 framework/bin
 framework/assets/www/.DS_Store
+framework/assets/www/phonegap-*.js
+.DS_Store
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ Commands:

 <pre>
 	help ...... See this message. Type help [command name] to see specific help topics.
-	gen ....... Generate an example PhoneGap application to current directory.
+	gen ....... Generate the example PhoneGap application to current directory (or optionally provide an output directory as parameter).
 	create .... Creates an Android compatible project from a WWW folder. 
 	classic ... Backwards support for droidgap script. Run "droidgap help classic" for more info.
 	update .... Copy a fresh phonegap.jar and phonegap.js into a valid PhoneGap/Android project.
@@ -41,8 +41,8 @@ Commands:
 Quickstart:

 <pre>
-  	$ droidgap gen example 
-  	$ cd example
+  	$ droidgap gen exampleapp 
+  	$ cd exampleapp
 	$ ant debug install && adb logcat
 </pre>

--- a/1
+++ b/1
@@ -0,0 +1 @@
+1.0.0rc3
--- a/bin/droidgap
+++ b/bin/droidgap
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-ROOT = File.expand_path(File.dirname(__FILE__).gsub('bin',''))
+ROOT = File.expand_path(File.dirname(__FILE__).gsub(/bin$/,''))
 require 'fileutils'
 require File.join(ROOT, "lib", "generate.rb")
 require File.join(ROOT, "lib", "classic.rb")
@@ -60,7 +60,7 @@ if ARGV.first.nil? || ARGV.first == 'help'
  Commands:
  
  help ...... See this message. Type help [command name] to see specific help topics.
-  gen ....... Generate an example PhoneGap application to current directory.
+  gen ....... Generate the example PhoneGap application to current directory (or optionally provide an output directory as parameter).
  create .... Creates an Android compatible project from a WWW folder. 
  classic ... Backwards support for droidgap script. Run "droidgap help classic" for more info.
  update .... Copy a fresh phonegap.jar and phonegap.js into a valid PhoneGap/Android project.
@@ -68,8 +68,8 @@ if ARGV.first.nil? || ARGV.first == 'help'
    
  Quickstart:
  
-  $ droidgap gen example 
-  $ cd example
+  $ droidgap gen exampleapp 
+  $ cd exampleapp
  $ ant debug install && adb logcat
  
  EOF
@@ -79,11 +79,13 @@ if ARGV.first.nil? || ARGV.first == 'help'
  DroidGap Generate
  -----------------
  
-  Generate an example PhoneGap application to path supplied or current working directory if none is supplied.
+  Generate the example PhoneGap application to path supplied or current working directory if none is supplied.
  
  Usage:
  
    droidgap gen [path]
+    
+  NOTE: Do *not* run "droidgap gen example" - you will end up with a recursive directory problem.
  
  EOF
  
--- a/example/index.html
+++ b/example/index.html
@@ -5,13 +5,13 @@
    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
    <title>PhoneGap</title>
 	  <link rel="stylesheet" href="master.css" type="text/css" media="screen" title="no title" charset="utf-8">
-	  <script type="text/javascript" charset="utf-8" src="phonegap.js"></script>
-	  <script type="text/javascript" charset="utf-8" src="main.js"></script>  
+	  <script type="text/javascript" charset="utf-8" src="phonegap-1.0.0rc3.js"></script>
+	  <script type="text/javascript" charset="utf-8" src="main.js"></script>

  </head>
  <body onload="init();" id="stage" class="theme">
    <h1>Welcome to PhoneGap!</h1>
-    <h2>this file is located at assets/index.html</h2>
+    <h2>this file is located at assets/www/index.html</h2>
    <div id="info">
        <h4>Platform: <span id="platform"> &nbsp;</span>,   Version: <span id="version">&nbsp;</span></h4>
        <h4>UUID: <span id="uuid"> &nbsp;</span>,   Name: <span id="name">&nbsp;</span></h4>
@@ -29,9 +29,10 @@
    <a href="#" class="btn large" onclick="beep();">Beep</a>
    <a href="#" class="btn large" onclick="vibrate();">Vibrate</a>
    <a href="#" class="btn large" onclick="show_pic();">Get a Picture</a>
-    <a href="#" class="btn large" onclick="get_contacts();">Get phone's contacts</a>
-    <div id="viewport" class="viewport" style="display: none;">       
+    <a href="#" class="btn large" onclick="get_contacts();">Get Phone's Contacts</a>
+    <a href="#" class="btn large" onclick="check_network();">Check Network</a>
+    <div id="viewport" class="viewport" style="display: none;">
      <img style="width:60px;height:60px" id="test_img" src="" />
-    </div> 
+    </div>
  </body>
 </html>
--- a/example/main.js
+++ b/example/main.js
@@ -1,127 +1,127 @@
-    var deviceInfo = function(){      
-      document.getElementById("platform").innerHTML = device.platform;
-      document.getElementById("version").innerHTML = device.version;
-      document.getElementById("uuid").innerHTML = device.uuid;
-      document.getElementById("name").innerHTML = device.name;
-      document.getElementById("width").innerHTML = screen.width;
-      document.getElementById("height").innerHTML = screen.height;
-      document.getElementById("colorDepth").innerHTML = screen.colorDepth;
+var deviceInfo = function() {
+    document.getElementById("platform").innerHTML = device.platform;
+    document.getElementById("version").innerHTML = device.version;
+    document.getElementById("uuid").innerHTML = device.uuid;
+    document.getElementById("name").innerHTML = device.name;
+    document.getElementById("width").innerHTML = screen.width;
+    document.getElementById("height").innerHTML = screen.height;
+    document.getElementById("colorDepth").innerHTML = screen.colorDepth;
+};
+
+var getLocation = function() {
+    var suc = function(p) {
+        alert(p.coords.latitude + " " + p.coords.longitude);
    };
-    
-    var getLocation = function() {
-      var suc = function(p){
-		    alert(p.coords.latitude + " " + p.coords.longitude);
-      };
-      var fail = function(){};
-      navigator.geolocation.getCurrentPosition(suc,fail);
+    var locFail = function() {
    };
-    
-    var beep = function(){
-	    navigator.notification.beep(2);
-    };
-    
-  	var vibrate = function(){
-  	  navigator.notification.vibrate(0);
-  	};
+    navigator.geolocation.getCurrentPosition(suc, locFail);
+};

-    function roundNumber(num) {
-      var dec = 3;
-      var result = Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);
-      return result;
+var beep = function() {
+    navigator.notification.beep(2);
+};
+
+var vibrate = function() {
+    navigator.notification.vibrate(0);
+};
+
+function roundNumber(num) {
+    var dec = 3;
+    var result = Math.round(num * Math.pow(10, dec)) / Math.pow(10, dec);
+    return result;
+}
+
+var accelerationWatch = null;
+
+function updateAcceleration(a) {
+    document.getElementById('x').innerHTML = roundNumber(a.x);
+    document.getElementById('y').innerHTML = roundNumber(a.y);
+    document.getElementById('z').innerHTML = roundNumber(a.z);
+}
+
+var toggleAccel = function() {
+    if (accelerationWatch !== null) {
+        navigator.accelerometer.clearWatch(accelerationWatch);
+        updateAcceleration({
+            x : "",
+            y : "",
+            z : ""
+        });
+        accelerationWatch = null;
+    } else {
+        var options = {};
+        options.frequency = 1000;
+        accelerationWatch = navigator.accelerometer.watchAcceleration(
+                updateAcceleration, function(ex) {
+                    alert("accel fail (" + ex.name + ": " + ex.message + ")");
+                }, options);
    }
-    
-    var accelerationWatch = false;
-    
-    var toggleAccel = function() {
-    	if (accelerationWatch) {
-    		navigator.accelerometer.clearWatch(accelerationWatch);
-    		updateAcceleration( {
-    			x : "",
-    			y : "",
-    			z : ""
-    		});
-    		accelerationWatch = false;
-    	} else {
-    		accelerationWatch = true;
-    		var options = new Object();
-    		options.frequency = 1000;
-    		accelerationWatch = navigator.accelerometer.watchAcceleration(
-    				updateAcceleration, function(ex) {
-    					navigator.accelerometer.clearWatch(accel_watch_id);
-    					alert("accel fail (" + ex.name + ": " + ex.message + ")");
-    				}, options);
-    	}
-    };
+};

-    function updateAcceleration(a) {
-		document.getElementById('x').innerHTML = roundNumber(a.x);
-		document.getElementById('y').innerHTML = roundNumber(a.y);
-		document.getElementById('z').innerHTML = roundNumber(a.z);
-    }
-    
-	var preventBehavior = function(e) { 
-      e.preventDefault(); 
-    };
+var preventBehavior = function(e) {
+    e.preventDefault();
+};

-    function show_pic()
-    {
-      var viewport = document.getElementById('viewport');
-      viewport.style.display = "";
-      navigator.camera.getPicture(dump_pic, fail, { quality: 50 }); 
-    }
+function dump_pic(data) {
+    var viewport = document.getElementById('viewport');
+    console.log(data);
+    viewport.style.display = "";
+    viewport.style.position = "absolute";
+    viewport.style.top = "10px";
+    viewport.style.left = "10px";
+    document.getElementById("test_img").src = "data:image/jpeg;base64," + data;
+}

-    function dump_pic(data)
-    {
-      var viewport = document.getElementById('viewport');
-      console.log(data);
-      viewport.style.display = "";
-      viewport.style.position = "absolute";
-      viewport.style.top = "10px";
-      viewport.style.left = "10px";
-      document.getElementById("test_img").src = "data:image/jpeg;base64," + data;
-    }
+function fail(msg) {
+    alert(msg);
+}

-    function close()
-    {
-      var viewport = document.getElementById('viewport');
-      viewport.style.position = "relative";
-      viewport.style.display = "none";
-    }
+function show_pic() {
+    navigator.camera.getPicture(dump_pic, fail, {
+        quality : 50
+    });
+}

-    function fail(fail)
-    {
-      alert(fail);
-    }
+function close() {
+    var viewport = document.getElementById('viewport');
+    viewport.style.position = "relative";
+    viewport.style.display = "none";
+}

-  	// This is just to do this.
-  	function readFile()
-  	{  	
-   		navigator.file.read('/sdcard/phonegap.txt', fail , fail);
-  	}
+function contacts_success(contacts) {
+    alert(contacts.length
+            + ' contacts returned.'
+            + (contacts[2] && contacts[2].name ? (' Third contact is ' + contacts[2].name.formatted)
+                    : ''));
+}

-  	function writeFile()
-  	{
-  	  	navigator.file.write('foo.txt', "This is a test of writing to a file", fail, fail);
-  	}
+function get_contacts() {
+    var obj = new ContactFindOptions();
+    obj.filter = "";
+    obj.multiple = true;
+    navigator.contacts.find(
+            [ "displayName", "name" ], contacts_success,
+            fail, obj);
+}

-	function get_contacts()
-	{
-		var obj = new ContactFindOptions();
-		obj.filter="";
-		obj.multiple=true;
-		obj.limit=5;
-		navigator.service.contacts.find(["displayName", "phoneNumbers", "emails"], contacts_success, fail, obj);
-	}
+function check_network() {
+    var networkState = navigator.network.connection.type;

-	function contacts_success(contacts)
-	{		
-		alert(contacts.length + ' contacts returned.' + 
-				(contacts[2] ? (' Third contact is ' + contacts[2].displayName) : ''));
-	}
-	
-  	
-	function init(){
-		//the next line makes it impossible to see Contacts on the HTC Evo since it doesn't have a scroll button
-//		document.addEventListener("touchmove", preventBehavior, false);  
-		document.addEventListener("deviceready", deviceInfo, true);		
-	}	
+    var states = {};
+    states[Connection.UNKNOWN]  = 'Unknown connection';
+    states[Connection.ETHERNET] = 'Ethernet connection';
+    states[Connection.WIFI]     = 'WiFi connection';
+    states[Connection.CELL_2G]  = 'Cell 2G connection';
+    states[Connection.CELL_3G]  = 'Cell 3G connection';
+    states[Connection.CELL_4G]  = 'Cell 4G connection';
+    states[Connection.NONE]     = 'No network connection';
+
+    confirm('Connection type:\n ' + states[networkState]);
+}
+
+function init() {
+    // the next line makes it impossible to see Contacts on the HTC Evo since it
+    // doesn't have a scroll button
+    // document.addEventListener("touchmove", preventBehavior, false);
+    document.addEventListener("deviceready", deviceInfo, true);
+}
--- a/framework/AndroidManifest.xml
+++ b/framework/AndroidManifest.xml
@@ -1,38 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:windowSoftInputMode="adjustPan"
      package="com.phonegap" android:versionName="1.1" android:versionCode="5">
    <supports-screens
    	android:largeScreens="true"
    	android:normalScreens="true"
    	android:smallScreens="true"
+    	android:xlargeScreens="true"
    	android:resizeable="true"
    	android:anyDensity="true"
    	/>
+
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.RECORD_VIDEO"/>
    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.WRITE_CONTACTS" />   
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />   
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    
+    <uses-feature android:name="android.hardware.camera" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
+
    <application android:icon="@drawable/icon" android:label="@string/app_name"
    	android:debuggable="true">
-        <activity android:name=".StandAlone"
+        <activity android:name=".StandAlone" android:windowSoftInputMode="adjustPan"
                  android:label="@string/app_name" android:configChanges="orientation|keyboardHidden">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+        <activity android:name="com.phonegap.DroidGap" android:label="@string/app_name" 
+                  android:configChanges="orientation|keyboardHidden">
+            <intent-filter>
+            </intent-filter>
+        </activity>
    </application>
-	<uses-sdk android:minSdkVersion="2" />

+	<uses-sdk android:minSdkVersion="2" />
 </manifest> 
--- a/framework/assets/js/accelerometer.js
+++ b/framework/assets/js/accelerometer.js
@@ -3,10 +3,14 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

-function Acceleration(x, y, z) {
+if (!PhoneGap.hasResource("accelerometer")) {
+PhoneGap.addResource("accelerometer");
+
+/** @constructor */
+var Acceleration = function(x, y, z) {
  this.x = x;
  this.y = y;
  this.z = z;
@@ -17,7 +21,7 @@ function Acceleration(x, y, z) {
 * This class provides access to device accelerometer data.
 * @constructor
 */
-function Accelerometer() {
+var Accelerometer = function() {

    /**
     * The last known acceleration.  type=Acceleration()
@@ -42,13 +46,13 @@ Accelerometer.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
 Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {

    // successCallback required
-    if (typeof successCallback != "function") {
+    if (typeof successCallback !== "function") {
        console.log("Accelerometer Error: successCallback is not a function");
        return;
    }

    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
+    if (errorCallback && (typeof errorCallback !== "function")) {
        console.log("Accelerometer Error: errorCallback is not a function");
        return;
    }
@@ -68,16 +72,16 @@ Accelerometer.prototype.getCurrentAcceleration = function(successCallback, error
 Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {

    // Default interval (10 sec)
-    var frequency = (options != undefined)? options.frequency : 10000;
+    var frequency = (options !== undefined)? options.frequency : 10000;

    // successCallback required
-    if (typeof successCallback != "function") {
+    if (typeof successCallback !== "function") {
        console.log("Accelerometer Error: successCallback is not a function");
        return;
    }

    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
+    if (errorCallback && (typeof errorCallback !== "function")) {
        console.log("Accelerometer Error: errorCallback is not a function");
        return;
    }
@@ -108,12 +112,15 @@ Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallb
 Accelerometer.prototype.clearWatch = function(id) {

    // Stop javascript timer & remove from timer list
-    if (id && navigator.accelerometer.timers[id] != undefined) {
+    if (id && navigator.accelerometer.timers[id] !== undefined) {
        clearInterval(navigator.accelerometer.timers[id]);
        delete navigator.accelerometer.timers[id];
    }
 };

 PhoneGap.addConstructor(function() {
-    if (typeof navigator.accelerometer == "undefined") navigator.accelerometer = new Accelerometer();
+    if (typeof navigator.accelerometer === "undefined") {
+        navigator.accelerometer = new Accelerometer();
+    }
 });
+}
--- a/framework/assets/js/app.js
+++ b/framework/assets/js/app.js
@@ -3,14 +3,18 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("app")) {
+PhoneGap.addResource("app");
+(function() {
+
 /**
 * Constructor
+ * @constructor
 */
-function App() {
-}
+var App = function() {};

 /**
 * Clear the resource cache.
@@ -21,20 +25,20 @@ App.prototype.clearCache = function() {

 /**
 * Load the url into the webview.
- * 
- * @param url			The URL to load
- * @param props			Properties that can be passed in to the activity:
- *		wait: int 							=> wait msec before loading URL
- * 		loadingDialog: "Title,Message"		=> display a native loading dialog
- * 		hideLoadingDialogOnPage: boolean 	=> hide loadingDialog when page loaded instead of when deviceready event occurs.
- * 		loadInWebView: boolean 				=> cause all links on web page to be loaded into existing web view, instead of being loaded into new browser.
- * 		loadUrlTimeoutValue: int			=> time in msec to wait before triggering a timeout error
- * 		errorUrl: URL						=> URL to load if there's an error loading specified URL with loadUrl().  Should be a local URL such as file:///android_asset/www/error.html");
- * 		keepRunning: boolean				=> enable app to keep running in background
- * 
+ *
+ * @param url           The URL to load
+ * @param props         Properties that can be passed in to the activity:
+ *      wait: int                           => wait msec before loading URL
+ *      loadingDialog: "Title,Message"      => display a native loading dialog
+ *      hideLoadingDialogOnPage: boolean    => hide loadingDialog when page loaded instead of when deviceready event occurs.
+ *      loadInWebView: boolean              => cause all links on web page to be loaded into existing web view, instead of being loaded into new browser.
+ *      loadUrlTimeoutValue: int            => time in msec to wait before triggering a timeout error
+ *      errorUrl: URL                       => URL to load if there's an error loading specified URL with loadUrl().  Should be a local URL such as file:///android_asset/www/error.html");
+ *      keepRunning: boolean                => enable app to keep running in background
+ *
 * Example:
- * 		App app = new App();
- * 		app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000});
+ *      App app = new App();
+ *      app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000});
 */
 App.prototype.loadUrl = function(url, props) {
    PhoneGap.exec(null, null, "App", "loadUrl", [url, props]);
@@ -56,11 +60,27 @@ App.prototype.clearHistory = function() {
 };

 /**
- * Add a class that implements a service.
- * 
- * @param serviceType
- * @param className
+ * Override the default behavior of the Android back button.
+ * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
+ *
+ * Note: The user should not have to call this method.  Instead, when the user
+ *       registers for the "backbutton" event, this is automatically done.
+ *
+ * @param override		T=override, F=cancel override
 */
-App.prototype.addService = function(serviceType, className) {
-	PhoneGap.exec(null, null, "App", "addService", [serviceType, className]);
+App.prototype.overrideBackbutton = function(override) {
+    PhoneGap.exec(null, null, "App", "overrideBackbutton", [override]);
 };
+
+/**
+ * Exit and terminate the application.
+ */
+App.prototype.exitApp = function() {
+	return PhoneGap.exec(null, null, "App", "exitApp", []);
+};
+
+PhoneGap.addConstructor(function() {
+    navigator.app = new App();
+});
+}());
+}
--- a/framework/assets/js/camera.js
+++ b/framework/assets/js/camera.js
@@ -3,15 +3,18 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("camera")) {
+PhoneGap.addResource("camera");
+
 /**
 * This class provides access to the device camera.
 *
 * @constructor
 */
-Camera = function() {
+var Camera = function() {
    this.successCallback = null;
    this.errorCallback = null;
    this.options = null;
@@ -31,6 +34,21 @@ Camera.DestinationType = {
 };
 Camera.prototype.DestinationType = Camera.DestinationType;

+/**
+ * Encoding of image returned from getPicture.
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.CAMERA,
+ *                encodingType: Camera.EncodingType.PNG})
+*/
+Camera.EncodingType = {
+    JPEG: 0,                    // Return JPEG encoded image
+    PNG: 1                      // Return PNG encoded image
+};
+Camera.prototype.EncodingType = Camera.EncodingType;
+
 /**
 * Source to getPicture from.
 *
@@ -59,13 +77,13 @@ Camera.prototype.PictureSourceType = Camera.PictureSourceType;
 Camera.prototype.getPicture = function(successCallback, errorCallback, options) {

    // successCallback required
-    if (typeof successCallback != "function") {
+    if (typeof successCallback !== "function") {
        console.log("Camera Error: successCallback is not a function");
        return;
    }

    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
+    if (errorCallback && (typeof errorCallback !== "function")) {
        console.log("Camera Error: errorCallback is not a function");
        return;
    }
@@ -75,17 +93,51 @@ Camera.prototype.getPicture = function(successCallback, errorCallback, options)
    if (options.quality) {
        quality = this.options.quality;
    }
+    
+    var maxResolution = 0;
+    if (options.maxResolution) {
+    	maxResolution = this.options.maxResolution;
+    }
+    
    var destinationType = Camera.DestinationType.DATA_URL;
    if (this.options.destinationType) {
        destinationType = this.options.destinationType;
    }
    var sourceType = Camera.PictureSourceType.CAMERA;
-    if (typeof this.options.sourceType == "number") {
+    if (typeof this.options.sourceType === "number") {
        sourceType = this.options.sourceType;
    }
-    PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType]);
+    var encodingType = Camera.EncodingType.JPEG;
+    if (typeof options.encodingType == "number") {
+        encodingType = this.options.encodingType;
+    }
+    
+    var targetWidth = -1;
+    if (typeof options.targetWidth == "number") {
+        targetWidth = options.targetWidth;
+    } else if (typeof options.targetWidth == "string") {
+        var width = new Number(options.targetWidth);
+        if (isNaN(width) === false) {
+            targetWidth = width.valueOf();
+        }
+    }
+
+    var targetHeight = -1;
+    if (typeof options.targetHeight == "number") {
+        targetHeight = options.targetHeight;
+    } else if (typeof options.targetHeight == "string") {
+        var height = new Number(options.targetHeight);
+        if (isNaN(height) === false) {
+            targetHeight = height.valueOf();
+        }
+    }
+    
+    PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [quality, destinationType, sourceType, targetWidth, targetHeight, encodingType]);
 };

 PhoneGap.addConstructor(function() {
-    if (typeof navigator.camera == "undefined") navigator.camera = new Camera();
+    if (typeof navigator.camera === "undefined") {
+        navigator.camera = new Camera();
+    }
 });
+}
--- a/framework/assets/js/capture.js
+++ b/framework/assets/js/capture.js
@@ -0,0 +1,191 @@
+/*
+ * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *
+ * Copyright (c) 2005-2010, Nitobi Software Inc.
+ * Copyright (c) 2010-2011, IBM Corporation
+ */
+
+if (!PhoneGap.hasResource("capture")) {
+PhoneGap.addResource("capture");
+	
+/**
+ * Represents a single file.
+ *
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+var MediaFile = function(name, fullPath, type, lastModifiedDate, size){
+	this.name = name || null;
+	this.fullPath = fullPath || null;
+	this.type = type || null;
+	this.lastModifiedDate = lastModifiedDate || null;
+	this.size = size || 0;
+};
+
+/**
+ * Launch device camera application for recording video(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ */
+MediaFile.prototype.getFormatData = function(successCallback, errorCallback){
+	PhoneGap.exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
+};
+
+/**
+ * MediaFileData encapsulates format information of a media file.
+ *
+ * @param {DOMString} codecs
+ * @param {long} bitrate
+ * @param {long} height
+ * @param {long} width
+ * @param {float} duration
+ */
+var MediaFileData = function(codecs, bitrate, height, width, duration){
+	this.codecs = codecs || null;
+	this.bitrate = bitrate || 0;
+	this.height = height || 0;
+	this.width = width || 0;
+	this.duration = duration || 0;
+};
+
+/**
+ * The CaptureError interface encapsulates all errors in the Capture API.
+ */
+var CaptureError = function(){
+	this.code = null;
+};
+
+// Capture error codes
+CaptureError.CAPTURE_INTERNAL_ERR = 0;
+CaptureError.CAPTURE_APPLICATION_BUSY = 1;
+CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
+CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
+CaptureError.CAPTURE_NOT_SUPPORTED = 20;
+
+/**
+ * The Capture interface exposes an interface to the camera and microphone of the hosting device.
+ */
+var Capture = function(){
+	this.supportedAudioModes = [];
+	this.supportedImageModes = [];
+	this.supportedVideoModes = [];
+};
+
+/**
+ * Launch audio recorder application for recording audio clip(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureAudioOptions} options
+ */
+Capture.prototype.captureAudio = function(successCallback, errorCallback, options){
+	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureAudio", [options]);
+};
+
+/**
+ * Launch camera application for taking image(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureImageOptions} options
+ */
+Capture.prototype.captureImage = function(successCallback, errorCallback, options){
+	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureImage", [options]);
+};
+
+/**
+ * Launch camera application for taking image(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureImageOptions} options
+ */
+Capture.prototype._castMediaFile = function(pluginResult){
+	var mediaFiles = [];
+	var i;
+	for (i = 0; i < pluginResult.message.length; i++) {
+		var mediaFile = new MediaFile();
+		mediaFile.name = pluginResult.message[i].name;
+		mediaFile.fullPath = pluginResult.message[i].fullPath;
+		mediaFile.type = pluginResult.message[i].type;
+		mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
+		mediaFile.size = pluginResult.message[i].size;
+		mediaFiles.push(mediaFile);
+	}
+	pluginResult.message = mediaFiles;
+	return pluginResult;
+};
+
+/**
+ * Launch device camera application for recording video(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureVideoOptions} options
+ */
+Capture.prototype.captureVideo = function(successCallback, errorCallback, options){
+	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureVideo", [options]);
+};
+
+/**
+ * Encapsulates a set of parameters that the capture device supports.
+ */
+var ConfigurationData = function(){
+	// The ASCII-encoded string in lower case representing the media type. 
+	this.type = null;
+	// The height attribute represents height of the image or video in pixels. 
+	// In the case of a sound clip this attribute has value 0. 
+	this.height = 0;
+	// The width attribute represents width of the image or video in pixels. 
+	// In the case of a sound clip this attribute has value 0
+	this.width = 0;
+};
+
+/**
+ * Encapsulates all image capture operation configuration options.
+ */
+var CaptureImageOptions = function(){
+	// Upper limit of images user can take. Value must be equal or greater than 1.
+	this.limit = 1;
+	// The selected image mode. Must match with one of the elements in supportedImageModes array.
+	this.mode = null;
+};
+
+/**
+ * Encapsulates all video capture operation configuration options.
+ */
+var CaptureVideoOptions = function(){
+	// Upper limit of videos user can record. Value must be equal or greater than 1.
+	this.limit = 1;
+	// Maximum duration of a single video clip in seconds.
+	this.duration = 0;
+	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
+	this.mode = null;
+};
+
+/**
+ * Encapsulates all audio capture operation configuration options.
+ */
+var CaptureAudioOptions = function(){
+	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
+	this.limit = 1;
+	// Maximum duration of a single sound clip in seconds.
+	this.duration = 0;
+	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+	this.mode = null;
+};
+
+PhoneGap.addConstructor(function(){
+	if (typeof navigator.device === "undefined") {
+		navigator.device = window.device = new Device();
+	}
+	if (typeof navigator.device.capture === "undefined") {
+		navigator.device.capture = window.device.capture = new Capture();
+	}
+});
+}
--- a/framework/assets/js/compass.js
+++ b/framework/assets/js/compass.js
@@ -3,14 +3,17 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("compass")) {
+PhoneGap.addResource("compass");
+
 /**
 * This class provides access to device Compass data.
 * @constructor
 */
-function Compass() {
+var Compass = function() {
    /**
     * The last known Compass position.
     */
@@ -34,13 +37,13 @@ Compass.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
 Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {

    // successCallback required
-    if (typeof successCallback != "function") {
+    if (typeof successCallback !== "function") {
        console.log("Compass Error: successCallback is not a function");
        return;
    }

    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
+    if (errorCallback && (typeof errorCallback !== "function")) {
        console.log("Compass Error: errorCallback is not a function");
        return;
    }
@@ -60,16 +63,16 @@ Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, o
 Compass.prototype.watchHeading= function(successCallback, errorCallback, options) {

    // Default interval (100 msec)
-    var frequency = (options != undefined) ? options.frequency : 100;
+    var frequency = (options !== undefined) ? options.frequency : 100;

    // successCallback required
-    if (typeof successCallback != "function") {
+    if (typeof successCallback !== "function") {
        console.log("Compass Error: successCallback is not a function");
        return;
    }

    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
+    if (errorCallback && (typeof errorCallback !== "function")) {
        console.log("Compass Error: errorCallback is not a function");
        return;
    }
@@ -109,5 +112,8 @@ Compass.prototype.clearWatch = function(id) {
 };

 PhoneGap.addConstructor(function() {
-    if (typeof navigator.compass == "undefined") navigator.compass = new Compass();
+    if (typeof navigator.compass === "undefined") {
+        navigator.compass = new Compass();
+    }
 });
+}
--- a/framework/assets/js/contact.js
+++ b/framework/assets/js/contact.js
@@ -3,38 +3,32 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("contact")) {
+PhoneGap.addResource("contact");
+
 /**
 * Contains information about a single contact.
+* @constructor
 * @param {DOMString} id unique identifier
 * @param {DOMString} displayName
 * @param {ContactName} name
 * @param {DOMString} nickname
-* @param {ContactField[]} phoneNumbers array of phone numbers
-* @param {ContactField[]} emails array of email addresses
-* @param {ContactAddress[]} addresses array of addresses
-* @param {ContactField[]} ims instant messaging user ids
-* @param {ContactOrganization[]} organizations
-* @param {DOMString} published date contact was first created
-* @param {DOMString} updated date contact was last updated
+* @param {Array.<ContactField>} phoneNumbers array of phone numbers
+* @param {Array.<ContactField>} emails array of email addresses
+* @param {Array.<ContactAddress>} addresses array of addresses
+* @param {Array.<ContactField>} ims instant messaging user ids
+* @param {Array.<ContactOrganization>} organizations
 * @param {DOMString} birthday contact's birthday
-* @param (DOMString} anniversary contact's anniversary
-* @param {DOMString} gender contact's gender
 * @param {DOMString} note user notes about contact
-* @param {DOMString} preferredUsername
-* @param {ContactField[]} photos
-* @param {ContactField[]} tags
-* @param {ContactField[]} relationships
-* @param {ContactField[]} urls contact's web sites
-* @param {ContactAccounts[]} accounts contact's online accounts
-* @param {DOMString} utcOffset UTC time zone offset
-* @param {DOMString} connected
+* @param {Array.<ContactField>} photos
+* @param {Array.<ContactField>} categories
+* @param {Array.<ContactField>} urls contact's web sites
 */
-var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, published, updated, birthday, anniversary, gender, note,
-    preferredUsername, photos, tags, relationships, urls, accounts, utcOffset, connected) {
+var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses,
+    ims, organizations, birthday, note, photos, categories, urls) {
    this.id = id || null;
    this.rawId = null;
    this.displayName = displayName || null;
@@ -45,31 +39,42 @@ var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, ad
    this.addresses = addresses || null; // ContactAddress[]
    this.ims = ims || null; // ContactField[]
    this.organizations = organizations || null; // ContactOrganization[]
-    this.published = published || null;
-    this.updated = updated || null;
    this.birthday = birthday || null;
-    this.anniversary = anniversary || null;
-    this.gender = gender || null;
    this.note = note || null;
-    this.preferredUsername = preferredUsername || null;
    this.photos = photos || null; // ContactField[]
-    this.tags = tags || null; // ContactField[]
-    this.relationships = relationships || null; // ContactField[]
+    this.categories = categories || null; // ContactField[]
    this.urls = urls || null; // ContactField[]
-    this.accounts = accounts || null; // ContactAccount[]
-    this.utcOffset = utcOffset || null;
-    this.connected = connected || null;
 };

+/**
+ *  ContactError.
+ *  An error code assigned by an implementation when an error has occurreds
+ * @constructor
+ */
+var ContactError = function() {
+    this.code=null;
+};
+
+/**
+ * Error codes
+ */
+ContactError.UNKNOWN_ERROR = 0;
+ContactError.INVALID_ARGUMENT_ERROR = 1;
+ContactError.TIMEOUT_ERROR = 2;
+ContactError.PENDING_OPERATION_ERROR = 3;
+ContactError.IO_ERROR = 4;
+ContactError.NOT_SUPPORTED_ERROR = 5;
+ContactError.PERMISSION_DENIED_ERROR = 20;
+
 /**
 * Removes contact from device storage.
 * @param successCB success callback
 * @param errorCB error callback
 */
 Contact.prototype.remove = function(successCB, errorCB) {
-    if (this.id == null) {
+    if (this.id === null) {
        var errorObj = new ContactError();
-        errorObj.code = ContactError.NOT_FOUND_ERROR;
+        errorObj.code = ContactError.UNKNOWN_ERROR;
        errorCB(errorObj);
    }
    else {
@@ -84,48 +89,49 @@ Contact.prototype.remove = function(successCB, errorCB) {
 */
 Contact.prototype.clone = function() {
    var clonedContact = PhoneGap.clone(this);
+    var i;
    clonedContact.id = null;
    clonedContact.rawId = null;
    // Loop through and clear out any id's in phones, emails, etc.
    if (clonedContact.phoneNumbers) {
-    	for (i=0; i<clonedContact.phoneNumbers.length; i++) {
-    		clonedContact.phoneNumbers[i].id = null;
-    	}
+        for (i = 0; i < clonedContact.phoneNumbers.length; i++) {
+            clonedContact.phoneNumbers[i].id = null;
+        }
    }
    if (clonedContact.emails) {
-    	for (i=0; i<clonedContact.emails.length; i++) {
-    		clonedContact.emails[i].id = null;
-    	}
+        for (i = 0; i < clonedContact.emails.length; i++) {
+            clonedContact.emails[i].id = null;
+        }
    }
    if (clonedContact.addresses) {
-    	for (i=0; i<clonedContact.addresses.length; i++) {
-    		clonedContact.addresses[i].id = null;
-    	}
+        for (i = 0; i < clonedContact.addresses.length; i++) {
+            clonedContact.addresses[i].id = null;
+        }
    }
    if (clonedContact.ims) {
-    	for (i=0; i<clonedContact.ims.length; i++) {
-    		clonedContact.ims[i].id = null;
-    	}
+        for (i = 0; i < clonedContact.ims.length; i++) {
+            clonedContact.ims[i].id = null;
+        }
    }
    if (clonedContact.organizations) {
-    	for (i=0; i<clonedContact.organizations.length; i++) {
-    		clonedContact.organizations[i].id = null;
-    	}
+        for (i = 0; i < clonedContact.organizations.length; i++) {
+            clonedContact.organizations[i].id = null;
+        }
    }
    if (clonedContact.tags) {
-    	for (i=0; i<clonedContact.tags.length; i++) {
-    		clonedContact.tags[i].id = null;
-    	}
+        for (i = 0; i < clonedContact.tags.length; i++) {
+            clonedContact.tags[i].id = null;
+        }
    }
-    if (clonedContact.relationships) {
-    	for (i=0; i<clonedContact.relationships.length; i++) {
-    		clonedContact.relationships[i].id = null;
-    	}
+    if (clonedContact.photos) {
+        for (i = 0; i < clonedContact.photos.length; i++) {
+            clonedContact.photos[i].id = null;
+        }
    }
    if (clonedContact.urls) {
-    	for (i=0; i<clonedContact.urls.length; i++) {
-    		clonedContact.urls[i].id = null;
-    	}
+        for (i = 0; i < clonedContact.urls.length; i++) {
+            clonedContact.urls[i].id = null;
+        }
    }
    return clonedContact;
 };
@@ -141,6 +147,7 @@ Contact.prototype.save = function(successCB, errorCB) {

 /**
 * Contact name.
+* @constructor
 * @param formatted
 * @param familyName
 * @param givenName
@@ -159,20 +166,22 @@ var ContactName = function(formatted, familyName, givenName, middle, prefix, suf

 /**
 * Generic contact field.
+* @constructor
 * @param {DOMString} id unique identifier, should only be set by native code
 * @param type
 * @param value
-* @param primary
+* @param pref
 */
-var ContactField = function(type, value, primary) {
+var ContactField = function(type, value, pref) {
 	this.id = null;
    this.type = type || null;
    this.value = value || null;
-    this.primary = primary || null;
+    this.pref = pref || null;
 };

 /**
 * Contact address.
+* @constructor
 * @param {DOMString} id unique identifier, should only be set by native code
 * @param formatted
 * @param streetAddress
@@ -181,8 +190,10 @@ var ContactField = function(type, value, primary) {
 * @param postalCode
 * @param country
 */
-var ContactAddress = function(formatted, streetAddress, locality, region, postalCode, country) {
+var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country) {
 	this.id = null;
+    this.pref = pref || null;
+    this.type = type || null;
    this.formatted = formatted || null;
    this.streetAddress = streetAddress || null;
    this.locality = locality || null;
@@ -193,6 +204,7 @@ var ContactAddress = function(formatted, streetAddress, locality, region, postal

 /**
 * Contact organization.
+* @constructor
 * @param {DOMString} id unique identifier, should only be set by native code
 * @param name
 * @param dept
@@ -202,38 +214,23 @@ var ContactAddress = function(formatted, streetAddress, locality, region, postal
 * @param location
 * @param desc
 */
-var ContactOrganization = function(name, dept, title, startDate, endDate, location, desc) {
+var ContactOrganization = function(pref, type, name, dept, title) {
 	this.id = null;
+    this.pref = pref || null;
+    this.type = type || null;
    this.name = name || null;
    this.department = dept || null;
    this.title = title || null;
-    this.startDate = startDate || null;
-    this.endDate = endDate || null;
-    this.location = location || null;
-    this.description = desc || null;
 };

-/**
-* Contact account.
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param domain
-* @param username
-* @param userid
-*/
-var ContactAccount = function(domain, username, userid) {
-	this.id = null;
-    this.domain = domain || null;
-    this.username = username || null;
-    this.userid = userid || null;
-}
-
 /**
 * Represents a group of Contacts.
+* @constructor
 */
 var Contacts = function() {
    this.inProgress = false;
-    this.records = new Array();
-}
+    this.records = [];
+};
 /**
 * Returns an array of Contacts matching the search criteria.
 * @param fields that should be searched
@@ -243,7 +240,16 @@ var Contacts = function() {
 * @return array of Contacts matching search criteria
 */
 Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-    PhoneGap.exec(successCB, errorCB, "Contacts", "search", [fields, options]);
+    if (successCB === null) {
+        throw new TypeError("You must specify a success callback for the find command.");
+    }
+    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
+        if (typeof errorCB === "function") {
+            errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
+        }
+    } else {
+        PhoneGap.exec(successCB, errorCB, "Contacts", "search", [fields, options]);        
+    }
 };

 /**
@@ -254,70 +260,51 @@ Contacts.prototype.find = function(fields, successCB, errorCB, options) {
 * @returns new Contact object
 */
 Contacts.prototype.create = function(properties) {
+    var i;
 	var contact = new Contact();
    for (i in properties) {
-        if (contact[i]!='undefined') {
-            contact[i]=properties[i];
+        if (contact[i] !== 'undefined') {
+            contact[i] = properties[i];
        }
    }
    return contact;
 };

 /**
-* This function returns and array of contacts.  It is required as we need to convert raw 
-* JSON objects into concrete Contact objects.  Currently this method is called after 
-* navigator.service.contacts.find but before the find methods success call back.
-* 
+* This function returns and array of contacts.  It is required as we need to convert raw
+* JSON objects into concrete Contact objects.  Currently this method is called after
+* navigator.contacts.find but before the find methods success call back.
+*
 * @param jsonArray an array of JSON Objects that need to be converted to Contact objects.
 * @returns an array of Contact objects
 */
 Contacts.prototype.cast = function(pluginResult) {
-	var contacts = new Array();
-	for (var i=0; i<pluginResult.message.length; i++) {
-		contacts.push(navigator.service.contacts.create(pluginResult.message[i]));
+	var contacts = [];
+	var i;
+	for (i=0; i<pluginResult.message.length; i++) {
+		contacts.push(navigator.contacts.create(pluginResult.message[i]));
 	}
 	pluginResult.message = contacts;
 	return pluginResult;
-}
+};

 /**
 * ContactFindOptions.
+ * @constructor
 * @param filter used to match contacts against
 * @param multiple boolean used to determine if more than one contact should be returned
- * @param limit maximum number of results to return from the contacts search
- * @param updatedSince return only contact records that have been updated on or after the given time
 */
-var ContactFindOptions = function(filter, multiple, limit, updatedSince) {
+var ContactFindOptions = function(filter, multiple) {
    this.filter = filter || '';
    this.multiple = multiple || false;
-    this.limit = limit || 1;
-    this.updatedSince = updatedSince || '';
 };

-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurred
- */
-var ContactError = function() {
-    this.code=null;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.NOT_FOUND_ERROR = 2;
-ContactError.TIMEOUT_ERROR = 3;
-ContactError.PENDING_OPERATION_ERROR = 4;
-ContactError.IO_ERROR = 5;
-ContactError.NOT_SUPPORTED_ERROR = 6;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
 /**
 * Add the contact interface into the browser.
 */
 PhoneGap.addConstructor(function() {
-    if(typeof navigator.service == "undefined") navigator.service = new Object();
-    if(typeof navigator.service.contacts == "undefined") navigator.service.contacts = new Contacts();
+    if(typeof navigator.contacts === "undefined") {
+        navigator.contacts = new Contacts();
+    }
 });
+}
--- a/framework/assets/js/crypto.js
+++ b/framework/assets/js/crypto.js
@@ -3,11 +3,17 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

 // TODO: Needs to be commented

+if (!PhoneGap.hasResource("crypto")) {
+PhoneGap.addResource("crypto");
+
+/**
+* @constructor
+*/
 var Crypto = function() {
 };

@@ -30,6 +36,8 @@ Crypto.prototype.getPlainString = function(string) {
 };

 PhoneGap.addConstructor(function() {
-    if (typeof navigator.Crypto == "undefined") navigator.Crypto = new Crypto();
+    if (typeof navigator.Crypto === "undefined") {
+        navigator.Crypto = new Crypto();
+    }
 });
-
+}
--- a/framework/assets/js/device.js
+++ b/framework/assets/js/device.js
@@ -3,15 +3,18 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("device")) {
+PhoneGap.addResource("device");
+
 /**
 * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
 * phone, etc.
 * @constructor
 */
-function Device() {
+var Device = function() {
    this.available = PhoneGap.available;
    this.platform = null;
    this.version = null;
@@ -35,7 +38,7 @@ function Device() {
            console.log("Error initializing PhoneGap: " + e);
            alert("Error initializing PhoneGap: "+e);
        });
-}
+};

 /**
 * Get device info
@@ -46,13 +49,13 @@ function Device() {
 Device.prototype.getInfo = function(successCallback, errorCallback) {

    // successCallback required
-    if (typeof successCallback != "function") {
+    if (typeof successCallback !== "function") {
        console.log("Device Error: successCallback is not a function");
        return;
    }

    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
+    if (errorCallback && (typeof errorCallback !== "function")) {
        console.log("Device Error: errorCallback is not a function");
        return;
    }
@@ -62,32 +65,41 @@ Device.prototype.getInfo = function(successCallback, errorCallback) {
 };

 /*
+ * DEPRECATED
 * This is only for Android.
 *
 * You must explicitly override the back button.
 */
 Device.prototype.overrideBackButton = function() {
-    BackButton.override();
-}
+	console.log("Device.overrideBackButton() is deprecated.  Use App.overrideBackbutton(true).");
+	navigator.app.overrideBackbutton(true);
+};

 /*
+ * DEPRECATED
 * This is only for Android.
 *
 * This resets the back button to the default behaviour
 */
 Device.prototype.resetBackButton = function() {
-    BackButton.reset();
-}
+	console.log("Device.resetBackButton() is deprecated.  Use App.overrideBackbutton(false).");
+	navigator.app.overrideBackbutton(false);
+};

 /*
+ * DEPRECATED
 * This is only for Android.
 *
 * This terminates the activity!
 */
 Device.prototype.exitApp = function() {
-    BackButton.exitApp();
-}
+	console.log("Device.exitApp() is deprecated.  Use App.exitApp().");
+	navigator.app.exitApp();
+};

 PhoneGap.addConstructor(function() {
-    navigator.device = window.device = new Device();
+    if (typeof navigator.device === "undefined") {
+        navigator.device = window.device = new Device();
+    }
 });
+}
--- a/framework/assets/js/file.js
+++ b/framework/assets/js/file.js
--- a/framework/assets/js/filetransfer.js
+++ b/framework/assets/js/filetransfer.js
@@ -0,0 +1,85 @@
+/*
+ * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ *
+ * Copyright (c) 2005-2010, Nitobi Software Inc.
+ * Copyright (c) 2010-2011, IBM Corporation
+ */
+
+if (!PhoneGap.hasResource("filetransfer")) {
+PhoneGap.addResource("filetransfer");
+
+/**
+ * FileTransfer uploads a file to a remote server.
+ * @constructor
+ */
+var FileTransfer = function() {};
+
+/**
+ * FileUploadResult
+ * @constructor
+ */
+var FileUploadResult = function() {
+    this.bytesSent = 0;
+    this.responseCode = null;
+    this.response = null;
+};
+
+/**
+ * FileTransferError
+ * @constructor
+ */
+var FileTransferError = function() {
+    this.code = null;
+};
+
+FileTransferError.FILE_NOT_FOUND_ERR = 1;
+FileTransferError.INVALID_URL_ERR = 2;
+FileTransferError.CONNECTION_ERR = 3;
+
+/**
+* Given an absolute file path, uploads a file on the device to a remote server
+* using a multipart HTTP request.
+* @param filePath {String}           Full path of the file on the device
+* @param server {String}             URL of the server to receive the file
+* @param successCallback (Function}  Callback to be invoked when upload has completed
+* @param errorCallback {Function}    Callback to be invoked upon error
+* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
+*/
+FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, debug) {
+
+    // check for options
+    var fileKey = null;
+    var fileName = null;
+    var mimeType = null;
+    var params = null;
+    if (options) {
+        fileKey = options.fileKey;
+        fileName = options.fileName;
+        mimeType = options.mimeType;
+        if (options.params) {
+            params = options.params;
+        }
+        else {
+            params = {};
+        }
+    }
+
+    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, debug]);
+};
+
+/**
+ * Options to customize the HTTP request used to upload files.
+ * @constructor
+ * @param fileKey {String}   Name of file request parameter.
+ * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
+ * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
+ * @param params {Object}    Object with key: value params to send to the server.
+ */
+var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
+    this.fileKey = fileKey || null;
+    this.fileName = fileName || null;
+    this.mimeType = mimeType || null;
+    this.params = params || null;
+};
+}
--- a/framework/assets/js/geolocation.js
+++ b/framework/assets/js/geolocation.js
@@ -3,14 +3,17 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("geolocation")) {
+PhoneGap.addResource("geolocation");
+
 /**
 * This class provides access to device GPS data.
 * @constructor
 */
-function Geolocation() {
+var Geolocation = function() {

    // The last known GPS position.
    this.lastPosition = null;
@@ -22,10 +25,11 @@ function Geolocation() {
 /**
 * Position error object
 *
+ * @constructor
 * @param code
 * @param message
 */
-function PositionError(code, message) {
+var PositionError = function(code, message) {
    this.code = code;
    this.message = message;
 };
@@ -42,7 +46,7 @@ PositionError.TIMEOUT = 3;
 * @param {PositionOptions} options     The options for getting the position data. (OPTIONAL)
 */
 Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
-    if (navigator._geo.listeners["global"]) {
+    if (navigator._geo.listeners.global) {
        console.log("Geolocation Error: Still waiting for previous getCurrentPosition() request.");
        try {
            errorCallback(new PositionError(PositionError.TIMEOUT, "Geolocation Error: Still waiting for previous getCurrentPosition() request."));
@@ -53,20 +57,20 @@ Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallba
    var maximumAge = 10000;
    var enableHighAccuracy = false;
    var timeout = 10000;
-    if (typeof options != "undefined") {
-        if (typeof options.maximumAge != "undefined") {
+    if (typeof options !== "undefined") {
+        if (typeof options.maximumAge !== "undefined") {
            maximumAge = options.maximumAge;
        }
-        if (typeof options.enableHighAccuracy != "undefined") {
+        if (typeof options.enableHighAccuracy !== "undefined") {
            enableHighAccuracy = options.enableHighAccuracy;
        }
-        if (typeof options.timeout != "undefined") {
+        if (typeof options.timeout !== "undefined") {
            timeout = options.timeout;
        }
    }
-    navigator._geo.listeners["global"] = {"success" : successCallback, "fail" : errorCallback };
+    navigator._geo.listeners.global = {"success" : successCallback, "fail" : errorCallback };
    PhoneGap.exec(null, null, "Geolocation", "getCurrentLocation", [enableHighAccuracy, timeout, maximumAge]);
-}
+};

 /**
 * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
@@ -81,17 +85,17 @@ Geolocation.prototype.watchPosition = function(successCallback, errorCallback, o
    var maximumAge = 10000;
    var enableHighAccuracy = false;
    var timeout = 10000;
-    if (typeof options != "undefined") {
-        if (typeof options.frequency  != "undefined") {
+    if (typeof options !== "undefined") {
+        if (typeof options.frequency  !== "undefined") {
            maximumAge = options.frequency;
        }
-        if (typeof options.maximumAge != "undefined") {
+        if (typeof options.maximumAge !== "undefined") {
            maximumAge = options.maximumAge;
        }
-        if (typeof options.enableHighAccuracy != "undefined") {
+        if (typeof options.enableHighAccuracy !== "undefined") {
            enableHighAccuracy = options.enableHighAccuracy;
        }
-        if (typeof options.timeout != "undefined") {
+        if (typeof options.timeout !== "undefined") {
            timeout = options.timeout;
        }
    }
@@ -118,7 +122,7 @@ Geolocation.prototype.success = function(id, lat, lng, alt, altacc, head, vel, s
    var coords = new Coordinates(lat, lng, alt, altacc, head, vel);
    var loc = new Position(coords, stamp);
    try {
-        if (lat == "undefined" || lng == "undefined") {
+        if (lat === "undefined" || lng === "undefined") {
            navigator._geo.listeners[id].fail(new PositionError(PositionError.POSITION_UNAVAILABLE, "Lat/Lng are undefined."));
        }
        else {
@@ -130,8 +134,8 @@ Geolocation.prototype.success = function(id, lat, lng, alt, altacc, head, vel, s
        console.log("Geolocation Error: Error calling success callback function.");
    }

-    if (id == "global") {
-        delete navigator._geo.listeners["global"];
+    if (id === "global") {
+        delete navigator._geo.listeners.global;
    }
 };

@@ -186,9 +190,9 @@ PhoneGap.addConstructor(function() {
    navigator._geo = new Geolocation();

    // No native geolocation object for Android 1.x, so use PhoneGap geolocation
-    if (typeof navigator.geolocation == 'undefined') {
+    if (typeof navigator.geolocation === 'undefined') {
        navigator.geolocation = navigator._geo;
        Geolocation.usingPhoneGap = true;
    }
 });
-
+}
--- a/framework/assets/js/keyevent.js
+++ b/framework/assets/js/keyevent.js
@@ -1,32 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- *
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-
-function KeyEvent() {
-}
-
-KeyEvent.prototype.backTrigger = function() {
-    var e = document.createEvent('Events');
-    e.initEvent('backKeyDown');
-    document.dispatchEvent(e);
-};
-
-KeyEvent.prototype.menuTrigger = function() {
-    var e = document.createEvent('Events');
-    e.initEvent('menuKeyDown');
-    document.dispatchEvent(e);
-};
-
-KeyEvent.prototype.searchTrigger = function() {
-    var e = document.createEvent('Events');
-    e.initEvent('searchKeyDown');
-    document.dispatchEvent(e);
-};
-
-if (document.keyEvent == null || typeof document.keyEvent == 'undefined') {
-    window.keyEvent = document.keyEvent = new KeyEvent();
-}
--- a/framework/assets/js/media.js
+++ b/framework/assets/js/media.js
@@ -3,66 +3,16 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

-/**
- * List of media objects.
- * PRIVATE
- */
-PhoneGap.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- */
-PhoneGap.Media = function() {};
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-PhoneGap.Media.getMediaObject = function(id) {
-    return PhoneGap.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param status        The status code (int)
- * @param msg           The status message (string)
- */
-PhoneGap.Media.onStatus = function(id, msg, value) {
-    var media = PhoneGap.mediaObjects[id];
-
-    // If state update
-    if (msg == Media.MEDIA_STATE) {
-        if (value == Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg == Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback(value);
-        }
-    }
-};
+if (!PhoneGap.hasResource("media")) {
+PhoneGap.addResource("media");

 /**
 * This class provides access to the device media, interfaces to both sound and video
 *
+ * @constructor
 * @param src                   The file name or url to play
 * @param successCallback       The callback to be called when the file is done playing or recording.
 *                                  successCallback() - OPTIONAL
@@ -73,28 +23,28 @@ PhoneGap.Media.onStatus = function(id, msg, value) {
 * @param positionCallback      The callback to be called when media position has changed.
 *                                  positionCallback(long position) - OPTIONAL
 */
-Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
+var Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {

    // successCallback optional
-    if (successCallback && (typeof successCallback != "function")) {
+    if (successCallback && (typeof successCallback !== "function")) {
        console.log("Media Error: successCallback is not a function");
        return;
    }

    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
+    if (errorCallback && (typeof errorCallback !== "function")) {
        console.log("Media Error: errorCallback is not a function");
        return;
    }

    // statusCallback optional
-    if (statusCallback && (typeof statusCallback != "function")) {
+    if (statusCallback && (typeof statusCallback !== "function")) {
        console.log("Media Error: statusCallback is not a function");
        return;
    }

    // statusCallback optional
-    if (positionCallback && (typeof positionCallback != "function")) {
+    if (positionCallback && (typeof positionCallback !== "function")) {
        console.log("Media Error: positionCallback is not a function");
        return;
    }
@@ -113,6 +63,7 @@ Media = function(src, successCallback, errorCallback, statusCallback, positionCa
 // Media messages
 Media.MEDIA_STATE = 1;
 Media.MEDIA_DURATION = 2;
+Media.MEDIA_POSITION = 3;
 Media.MEDIA_ERROR = 9;

 // Media states
@@ -128,8 +79,8 @@ Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
 * This class contains information about any Media errors.
 * @constructor
 */
-function MediaError() {
-    this.code = null,
+var MediaError = function() {
+    this.code = null;
    this.message = "";
 };

@@ -152,6 +103,13 @@ Media.prototype.stop = function() {
    return PhoneGap.exec(null, null, "Media", "stopPlayingAudio", [this.id]);
 };

+/**
+ * Seek or jump to a new time in the track..
+ */
+Media.prototype.seekTo = function(milliseconds) {
+    PhoneGap.exec(null, null, "Media", "seekToAudio", [this.id, milliseconds]);
+};
+
 /**
 * Pause playing audio file.
 */
@@ -171,8 +129,6 @@ Media.prototype.getDuration = function() {

 /**
 * Get position of audio.
- *
- * @return
 */
 Media.prototype.getCurrentPosition = function(success, fail) {
    PhoneGap.exec(success, fail, "Media", "getCurrentPositionAudio", [this.id]);
@@ -199,3 +155,60 @@ Media.prototype.release = function() {
    PhoneGap.exec(null, null, "Media", "release", [this.id]);
 };

+/**
+ * List of media objects.
+ * PRIVATE
+ */
+PhoneGap.mediaObjects = {};
+
+/**
+ * Object that receives native callbacks.
+ * PRIVATE
+ * @constructor
+ */
+PhoneGap.Media = function() {};
+
+/**
+ * Get the media object.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ */
+PhoneGap.Media.getMediaObject = function(id) {
+    return PhoneGap.mediaObjects[id];
+};
+
+/**
+ * Audio has status update.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ * @param status        The status code (int)
+ * @param msg           The status message (string)
+ */
+PhoneGap.Media.onStatus = function(id, msg, value) {
+    var media = PhoneGap.mediaObjects[id];
+    // If state update
+    if (msg === Media.MEDIA_STATE) {
+        if (value === Media.MEDIA_STOPPED) {
+            if (media.successCallback) {
+                media.successCallback();
+            }
+        }
+        if (media.statusCallback) {
+            media.statusCallback(value);
+        }
+    }
+    else if (msg === Media.MEDIA_DURATION) {
+        media._duration = value;
+    }
+    else if (msg === Media.MEDIA_ERROR) {
+        if (media.errorCallback) {
+            media.errorCallback(value);
+        }
+    }
+    else if (msg == Media.MEDIA_POSITION) {
+        media._position = value;
+    }
+};
+}
--- a/framework/assets/js/network.js
+++ b/framework/assets/js/network.js
@@ -3,60 +3,80 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("network")) {
+PhoneGap.addResource("network");
+
 /**
- * This class contains information about any NetworkStatus.
+ * This class contains information about the current network Connection.
 * @constructor
 */
-function NetworkStatus() {
-    //this.code = null;
-    //this.message = "";
+var Connection = function() {
+    this.type = null;
+    this._firstRun = true;
+    this._timer = null;
+    this.timeout = 500;
+
+    var me = this;
+    this.getInfo(
+        function(type) {
+            // Need to send events if we are on or offline
+            if (type == "none") {
+                // set a timer if still offline at the end of timer send the offline event
+                me._timer = setTimeout(function(){
+                    me.type = type;
+                    PhoneGap.fireEvent('offline');
+                    me._timer = null;
+                    }, me.timeout);
+            } else {
+                // If there is a current offline event pending clear it
+                if (me._timer != null) {
+                    clearTimeout(me._timer);
+                    me._timer = null;
+                }
+                me.type = type;
+                PhoneGap.fireEvent('online');
+            }
+            
+            // should only fire this once
+            if (me._firstRun) {
+                me._firstRun = false;
+                PhoneGap.onPhoneGapConnectionReady.fire();
+            }            
+        },
+        function(e) {
+            console.log("Error initializing Network Connection: " + e);
+        });
 };

-NetworkStatus.NOT_REACHABLE = 0;
-NetworkStatus.REACHABLE_VIA_CARRIER_DATA_NETWORK = 1;
-NetworkStatus.REACHABLE_VIA_WIFI_NETWORK = 2;
+Connection.UNKNOWN = "unknown";
+Connection.ETHERNET = "ethernet";
+Connection.WIFI = "wifi";
+Connection.CELL_2G = "2g";
+Connection.CELL_3G = "3g";
+Connection.CELL_4G = "4g";
+Connection.NONE = "none";

 /**
- * This class provides access to device Network data (reachability).
- * @constructor
+ * Get connection info
+ *
+ * @param {Function} successCallback The function to call when the Connection data is available
+ * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
 */
-function Network() {
-    /**
-     * The last known Network status.
-     * { hostName: string, ipAddress: string,
-        remoteHostStatus: int(0/1/2), internetConnectionStatus: int(0/1/2), localWiFiConnectionStatus: int (0/2) }
-     */
-    this.lastReachability = null;
+Connection.prototype.getInfo = function(successCallback, errorCallback) {
+    // Get info
+    PhoneGap.exec(successCallback, errorCallback, "Network Status", "getConnectionInfo", []);
 };

-/**
- * Called by the geolocation framework when the reachability status has changed.
- * @param {Reachibility} reachability The current reachability status.
- */
-// TODO: Callback from native code not implemented for Android
-Network.prototype.updateReachability = function(reachability) {
-    this.lastReachability = reachability;
-};
-
-/**
- * Determine if a URI is reachable over the network.
-
- * @param {Object} uri
- * @param {Function} callback
- * @param {Object} options  (isIpAddress:boolean)
- */
-Network.prototype.isReachable = function(uri, callback, options) {
-    var isIpAddress = false;
-    if (options && options.isIpAddress) {
-        isIpAddress = options.isIpAddress;
-    }
-    PhoneGap.exec(callback, null, "Network Status", "isReachable", [uri, isIpAddress]);
-};

 PhoneGap.addConstructor(function() {
-    if (typeof navigator.network == "undefined") navigator.network = new Network();
+    if (typeof navigator.network === "undefined") {
+        navigator.network = new Object();
+    }
+    if (typeof navigator.network.connection === "undefined") {
+        navigator.network.connection = new Connection();
+    }
 });
-
+}
--- a/framework/assets/js/notification.js
+++ b/framework/assets/js/notification.js
@@ -3,14 +3,18 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("notification")) {
+PhoneGap.addResource("notification");
+
 /**
 * This class provides access to notifications on the device.
+ * @constructor
 */
-function Notification() {
-}
+var Notification = function() {
+};

 /**
 * Open a native alert dialog, with a customizable title and button text.
@@ -111,6 +115,8 @@ Notification.prototype.beep = function(count) {
 };

 PhoneGap.addConstructor(function() {
-    if (typeof navigator.notification == "undefined") navigator.notification = new Notification();
+    if (typeof navigator.notification === "undefined") {
+        navigator.notification = new Notification();
+    }
 });
-
+}
--- a/framework/assets/js/phonegap.js.base
+++ b/framework/assets/js/phonegap.js.base
@@ -1,11 +1,12 @@
 /*
 * PhoneGap is available under *either* the terms of the modified BSD license *or* the
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
+ *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (typeof PhoneGap === "undefined") {

 /**
 * The order of events during page load and PhoneGap startup is as follows:
@@ -18,6 +19,8 @@
 * onPhoneGapInfoReady        Internal event fired when device properties are available
 * onDeviceReady              User event fired to indicate that PhoneGap is ready
 * onResume                   User event fired to indicate a start/resume lifecycle event
+ * onPause                    User event fired to indicate a pause lifecycle event
+ * onDestroy                  Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
 *
 * The only PhoneGap events that user code should register for are:
 *      onDeviceReady
@@ -26,10 +29,12 @@
 * Listeners can be registered as:
 *      document.addEventListener("deviceready", myDeviceReadyListener, false);
 *      document.addEventListener("resume", myResumeListener, false);
+ *      document.addEventListener("pause", myPauseListener, false);
 */

-if (typeof(DeviceInfo) != 'object')
-    DeviceInfo = {};
+if (typeof(DeviceInfo) !== 'object') {
+    var DeviceInfo = {};
+}

 /**
 * This represents the PhoneGap API itself, and provides a global namespace for accessing
@@ -44,11 +49,36 @@ var PhoneGap = {
    }
 };

+/**
+ * List of resource files loaded by PhoneGap.
+ * This is used to ensure JS and other files are loaded only once.
+ */
+PhoneGap.resources = {base: true};
+
+/**
+ * Determine if resource has been loaded by PhoneGap
+ *
+ * @param name
+ * @return
+ */
+PhoneGap.hasResource = function(name) {
+    return PhoneGap.resources[name];
+};
+
+/**
+ * Add a resource to list of loaded resources by PhoneGap
+ *
+ * @param name
+ */
+PhoneGap.addResource = function(name) {
+    PhoneGap.resources[name] = true;
+};

 /**
 * Custom pub-sub channel that can have functions subscribed to it
+ * @constructor
 */
-PhoneGap.Channel = function(type)
+PhoneGap.Channel = function (type)
 {
    this.type = type;
    this.handlers = {};
@@ -58,7 +88,7 @@ PhoneGap.Channel = function(type)
 };

 /**
- * Subscribes the given function to the channel. Any time that 
+ * Subscribes the given function to the channel. Any time that
 * Channel.fire is called so too will the function.
 * Optionally specify an execution context for the function
 * and a guid that can be used to stop subscribing to the channel.
@@ -66,10 +96,10 @@ PhoneGap.Channel = function(type)
 */
 PhoneGap.Channel.prototype.subscribe = function(f, c, g) {
    // need a function to call
-    if (f == null) { return; }
+    if (f === null) { return; }

    var func = f;
-    if (typeof c == "object" && f instanceof Function) { func = PhoneGap.close(c, f); }
+    if (typeof c === "object" && typeof f === "function") { func = PhoneGap.close(c, f); }

    g = g || func.observer_guid || f.observer_guid || this.guid++;
    func.observer_guid = g;
@@ -88,9 +118,9 @@ PhoneGap.Channel.prototype.subscribeOnce = function(f, c) {
    var m = function() {
        f.apply(c || null, arguments);
        _this.unsubscribe(g);
-    }
+    };
    if (this.fired) {
-	    if (typeof c == "object" && f instanceof Function) { f = PhoneGap.close(c, f); }
+        if (typeof c === "object" && typeof f === "function") { f = PhoneGap.close(c, f); }
        f.apply(this, this.fireArgs);
    } else {
        g = this.subscribe(m);
@@ -98,26 +128,29 @@ PhoneGap.Channel.prototype.subscribeOnce = function(f, c) {
    return g;
 };

-/** 
+/**
 * Unsubscribes the function with the given guid from the channel.
 */
 PhoneGap.Channel.prototype.unsubscribe = function(g) {
-    if (g instanceof Function) { g = g.observer_guid; }
+    if (typeof g === "function") { g = g.observer_guid; }
    this.handlers[g] = null;
    delete this.handlers[g];
 };

-/** 
+/**
 * Calls all functions subscribed to this channel.
 */
 PhoneGap.Channel.prototype.fire = function(e) {
    if (this.enabled) {
        var fail = false;
-        for (var item in this.handlers) {
-            var handler = this.handlers[item];
-            if (handler instanceof Function) {
-                var rv = (handler.apply(this, arguments)==false);
-                fail = fail || rv;
+        var item, handler, rv;
+        for (item in this.handlers) {
+            if (this.handlers.hasOwnProperty(item)) {
+                handler = this.handlers[item];
+                if (typeof handler === "function") {
+                    rv = (handler.apply(this, arguments) === false);
+                    fail = fail || rv;
+                }
            }
        }
        this.fired = true;
@@ -134,18 +167,29 @@ PhoneGap.Channel.prototype.fire = function(e) {
 PhoneGap.Channel.join = function(h, c) {
    var i = c.length;
    var f = function() {
-        if (!(--i)) h();
+        if (!(--i)) {
+            h();
+        }
+    };
+    var len = i;
+    var j;
+    for (j=0; j<len; j++) {
+        if (!c[j].fired) {
+            c[j].subscribeOnce(f);
+        }
+        else {
+            i--;
+        }
    }
-    for (var j=0; j<i; j++) {
-        (!c[j].fired?c[j].subscribeOnce(f):i--);
+    if (!i) {
+        h();
    }
-    if (!i) h();
 };

 /**
 * Boolean flag indicating if the PhoneGap API is available and initialized.
 */ // TODO: Remove this, it is unused here ... -jm
-PhoneGap.available = DeviceInfo.uuid != undefined;
+PhoneGap.available = DeviceInfo.uuid !== undefined;

 /**
 * Add an initialization function to a queue that ensures it will run and initialize
@@ -183,10 +227,10 @@ PhoneGap.addPlugin = function(name, obj) {
    else {
        console.log("Error: Plugin "+name+" already exists.");
    }
-}
+};

 /**
- * onDOMContentLoaded channel is fired when the DOM content 
+ * onDOMContentLoaded channel is fired when the DOM content
 * of the page has been parsed.
 */
 PhoneGap.onDOMContentLoaded = new PhoneGap.Channel('onDOMContentLoaded');
@@ -214,6 +258,12 @@ PhoneGap.onPhoneGapReady = new PhoneGap.Channel('onPhoneGapReady');
 */
 PhoneGap.onPhoneGapInfoReady = new PhoneGap.Channel('onPhoneGapInfoReady');

+/**
+ * onPhoneGapConnectionReady channel is fired when the PhoneGap connection properties
+ * has been set.
+ */
+PhoneGap.onPhoneGapConnectionReady = new PhoneGap.Channel('onPhoneGapConnectionReady');
+
 /**
 * onResume channel is fired when the PhoneGap native code
 * resumes.
@@ -226,8 +276,19 @@ PhoneGap.onResume = new PhoneGap.Channel('onResume');
 */
 PhoneGap.onPause = new PhoneGap.Channel('onPause');

+/**
+ * onDestroy channel is fired when the PhoneGap native code
+ * is destroyed.  It is used internally.
+ * Window.onunload should be used by the user.
+ */
+PhoneGap.onDestroy = new PhoneGap.Channel('onDestroy');
+PhoneGap.onDestroy.subscribeOnce(function() {
+    PhoneGap.shuttingDown = true;
+});
+PhoneGap.shuttingDown = false;
+
 // _nativeReady is global variable that the native side can set
-// to signify that the native code is ready. It is a global since 
+// to signify that the native code is ready. It is a global since
 // it may be called before any PhoneGap JS is ready.
 if (typeof _nativeReady !== 'undefined') { PhoneGap.onNativeReady.fire(); }

@@ -238,6 +299,39 @@ if (typeof _nativeReady !== 'undefined') { PhoneGap.onNativeReady.fire(); }
 PhoneGap.onDeviceReady = new PhoneGap.Channel('onDeviceReady');


+// Array of channels that must fire before "deviceready" is fired
+PhoneGap.deviceReadyChannelsArray = [ PhoneGap.onPhoneGapReady, PhoneGap.onPhoneGapInfoReady, PhoneGap.onPhoneGapConnectionReady];
+
+// Hashtable of user defined channels that must also fire before "deviceready" is fired
+PhoneGap.deviceReadyChannelsMap = {};
+
+/**
+ * Indicate that a feature needs to be initialized before it is ready to be used.
+ * This holds up PhoneGap's "deviceready" event until the feature has been initialized
+ * and PhoneGap.initComplete(feature) is called.
+ *
+ * @param feature {String}     The unique feature name
+ */
+PhoneGap.waitForInitialization = function(feature) {
+    if (feature) {
+        var channel = new PhoneGap.Channel(feature);
+        PhoneGap.deviceReadyChannelsMap[feature] = channel;
+        PhoneGap.deviceReadyChannelsArray.push(channel);
+    }
+};
+
+/**
+ * Indicate that initialization code has completed and the feature is ready to be used.
+ *
+ * @param feature {String}     The unique feature name
+ */
+PhoneGap.initializationComplete = function(feature) {
+    var channel = PhoneGap.deviceReadyChannelsMap[feature];
+    if (channel) {
+        channel.fire();
+    }
+};
+
 /**
 * Create all PhoneGap objects once page has fully loaded and native side is ready.
 */
@@ -245,11 +339,20 @@ PhoneGap.Channel.join(function() {

    // Start listening for XHR callbacks
    setTimeout(function() {
-            if (CallbackServer.usePolling()) {
+            if (PhoneGap.UsePolling) {
                PhoneGap.JSCallbackPolling();
            }
            else {
-                PhoneGap.JSCallback();
+                var polling = prompt("usePolling", "gap_callbackServer:");
+                PhoneGap.UsePolling = polling;
+                if (polling == "true") {
+                    PhoneGap.UsePolling = true;
+                    PhoneGap.JSCallbackPolling();
+                }
+                else {
+                    PhoneGap.UsePolling = false;
+                    PhoneGap.JSCallback();
+                }
            }
        }, 1);

@@ -259,22 +362,17 @@ PhoneGap.Channel.join(function() {
    // Fire event to notify that all objects are created
    PhoneGap.onPhoneGapReady.fire();

+    // Fire onDeviceReady event once all constructors have run and PhoneGap info has been
+    // received from native side, and any user defined initialization channels.
+    PhoneGap.Channel.join(function() {
+        PhoneGap.onDeviceReady.fire();
+
+        // Fire the onresume event, since first one happens before JavaScript is loaded
+        PhoneGap.onResume.fire();
+    }, PhoneGap.deviceReadyChannelsArray);
+
 }, [ PhoneGap.onDOMContentLoaded, PhoneGap.onNativeReady ]);

-/**
- * Fire onDeviceReady event once all constructors have run and PhoneGap info has been
- * received from native side.
- */
-PhoneGap.Channel.join(function() {
-    // Turn off app loading dialog
-    navigator.notification.activityStop();
-
-    PhoneGap.onDeviceReady.fire();
-
-    // Fire the onresume event, since first one happens before JavaScript is loaded
-    PhoneGap.onResume.fire();
-}, [ PhoneGap.onPhoneGapReady, PhoneGap.onPhoneGapInfoReady]);
-
 // Listen for DOMContentLoaded and notify our channel subscribers
 document.addEventListener('DOMContentLoaded', function() {
    PhoneGap.onDOMContentLoaded.fire();
@@ -285,76 +383,105 @@ PhoneGap.m_document_addEventListener = document.addEventListener;

 document.addEventListener = function(evt, handler, capture) {
    var e = evt.toLowerCase();
-    if (e == 'deviceready') {
+    if (e === 'deviceready') {
        PhoneGap.onDeviceReady.subscribeOnce(handler);
-    } else if (e == 'resume') {
+    } else if (e === 'resume') {
        PhoneGap.onResume.subscribe(handler);
-    } else if (e == 'pause') {
+        if (PhoneGap.onDeviceReady.fired) {
+            PhoneGap.onResume.fire();
+        }
+    } else if (e === 'pause') {
        PhoneGap.onPause.subscribe(handler);
-    } else {
+    }
+    else {
+        // If subscribing to Android backbutton
+        if (e === 'backbutton') {
+            PhoneGap.exec(null, null, "App", "overrideBackbutton", [true]);
+        }
+
        PhoneGap.m_document_addEventListener.call(document, evt, handler, capture);
    }
 };

+// Intercept calls to document.removeEventListener and watch for events that
+// are generated by PhoneGap native code
+PhoneGap.m_document_removeEventListener = document.removeEventListener;
+
+document.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+
+    // If unsubscribing to Android backbutton
+    if (e === 'backbutton') {
+        PhoneGap.exec(null, null, "App", "overrideBackbutton", [false]);
+    }
+
+    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
+};
+
+/**
+ * Method to fire event from native code
+ */
+PhoneGap.fireEvent = function(type) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    document.dispatchEvent(e);
+};
+
 /**
 * If JSON not included, use our own stringify. (Android 1.6)
 * The restriction on ours is that it must be an array of simple types.
 *
 * @param args
- * @return
+ * @return {String}
 */
 PhoneGap.stringify = function(args) {
-    if (typeof JSON == "undefined") {
+    if (typeof JSON === "undefined") {
        var s = "[";
-        for (var i=0; i<args.length; i++) {
-            if (i > 0) {
-                s = s + ",";
-            }
-            var type = typeof args[i];
-            if ((type == "number") || (type == "boolean")) {
-                s = s + args[i];
-            }
-            else if (args[i] instanceof Array) {
-            	s = s + "[" + args[i] + "]";
-            }
-            else if (args[i] instanceof Object) {
-            	var start = true;
-            	s = s + '{';
-            	for (var name in args[i]) {
-            		if (args[i][name] != null) {
-	            		if (!start) {
-	            			s = s + ',';
-	            		}
-	            		s = s + '"' + name + '":';
-	            		var nameType = typeof args[i][name];
-	            		if ((nameType == "number") || (nameType == "boolean")) {
-	            			s = s + args[i][name];
-	            		}
-	            		else if ((typeof args[i][name]) == 'function') {
-		           			// don't copy the functions
-	            			s = s + '""'; 
-	            		}
-	            		else if (args[i][name] instanceof Object) {
-	            			s = s + this.stringify(args[i][name]);
-	            		}
-	            		else {
-	                        s = s + '"' + args[i][name] + '"';            			
-	            		}
-	                    start=false;
-	                 }
-            	} 
-            	s = s + '}';
-            }
-            else {
-                var a = args[i].replace(/\\/g, '\\\\');
-                a = a.replace(/"/g, '\\"');
-                s = s + '"' + a + '"';
+        var i, type, start, name, nameType, a;
+        for (i = 0; i < args.length; i++) {
+            if (args[i] !== null) {
+                if (i > 0) {
+                    s = s + ",";
+                }
+                type = typeof args[i];
+                if ((type === "number") || (type === "boolean")) {
+                    s = s + args[i];
+                } else if (args[i] instanceof Array) {
+                    s = s + "[" + args[i] + "]";
+                } else if (args[i] instanceof Object) {
+                    start = true;
+                    s = s + '{';
+                    for (name in args[i]) {
+                        if (args[i][name] !== null) {
+                            if (!start) {
+                                s = s + ',';
+                            }
+                            s = s + '"' + name + '":';
+                            nameType = typeof args[i][name];
+                            if ((nameType === "number") || (nameType === "boolean")) {
+                                s = s + args[i][name];
+                            } else if ((typeof args[i][name]) === 'function') {
+                                // don't copy the functions
+                                s = s + '""';
+                            } else if (args[i][name] instanceof Object) {
+                                s = s + PhoneGap.stringify(args[i][name]);
+                            } else {
+                                s = s + '"' + args[i][name] + '"';
+                            }
+                            start = false;
+                        }
+                    }
+                    s = s + '}';
+                } else {
+                    a = args[i].replace(/\\/g, '\\\\');
+                    a = a.replace(/"/g, '\\"');
+                    s = s + '"' + a + '"';
+                }
            }
        }
        s = s + "]";
        return s;
-    }
-    else {
+    } else {
        return JSON.stringify(args);
    }
 };
@@ -363,36 +490,41 @@ PhoneGap.stringify = function(args) {
 * Does a deep clone of the object.
 *
 * @param obj
- * @return
+ * @return {Object}
 */
 PhoneGap.clone = function(obj) {
-	if(!obj) { 
-		return obj;
-	}
-	
-	if(obj instanceof Array){
-		var retVal = new Array();
-		for(var i = 0; i < obj.length; ++i){
-			retVal.push(PhoneGap.clone(obj[i]));
-		}
-		return retVal;
-	}
-	
-	if (obj instanceof Function) {
-		return obj;
-	}
-	
-	if(!(obj instanceof Object)){
-		return obj;
-	}
-
-	retVal = new Object();
-	for(i in obj){
-		if(!(i in retVal) || retVal[i] != obj[i]) {
-			retVal[i] = PhoneGap.clone(obj[i]);
-		}
-	}
-	return retVal;
+    var i, retVal;
+    if(!obj) { 
+        return obj;
+    }
+    
+    if(obj instanceof Array){
+        retVal = [];
+        for(i = 0; i < obj.length; ++i){
+            retVal.push(PhoneGap.clone(obj[i]));
+        }
+        return retVal;
+    }
+    
+    if (typeof obj === "function") {
+        return obj;
+    }
+    
+    if(!(obj instanceof Object)){
+        return obj;
+    }
+    
+    if (obj instanceof Date) {
+        return obj;
+    }
+    
+    retVal = {};
+    for(i in obj){
+        if(!(i in retVal) || retVal[i] !== obj[i]) {
+            retVal[i] = PhoneGap.clone(obj[i]);
+        }
+    }
+    return retVal;
 };

 PhoneGap.callbackId = 0;
@@ -412,7 +544,7 @@ PhoneGap.callbackStatus = {


 /**
- * Execute a PhoneGap command.  It is up to the native side whether this action is synch or async.  
+ * Execute a PhoneGap command.  It is up to the native side whether this action is synch or async.
 * The native side can return:
 *      Synchronous: PluginResult object as a JSON string
 *      Asynchrounous: Empty string ""
@@ -423,7 +555,7 @@ PhoneGap.callbackStatus = {
 * @param {Function} fail       The fail callback
 * @param {String} service      The name of the service to use
 * @param {String} action       Action to be run in PhoneGap
- * @param {String[]} [args]     Zero or more arguments to pass to the method
+ * @param {Array.<String>} [args]     Zero or more arguments to pass to the method
 */
 PhoneGap.exec = function(success, fail, service, action, args) {
    try {
@@ -431,24 +563,23 @@ PhoneGap.exec = function(success, fail, service, action, args) {
        if (success || fail) {
            PhoneGap.callbacks[callbackId] = {success:success, fail:fail};
        }
-        
-        // Note: Device returns string, but for some reason emulator returns object - so convert to string.
-        var r = ""+PluginManager.exec(service, action, callbackId, this.stringify(args), true);
-        
+
+        var r = prompt(PhoneGap.stringify(args), "gap:"+PhoneGap.stringify([service, action, callbackId, true]));
+
        // If a result was returned
        if (r.length > 0) {
            eval("var v="+r+";");
-        
-            // If status is OK, then return value back to caller
-            if (v.status == PhoneGap.callbackStatus.OK) {

-                // If there is a success callback, then call it now with returned value
+            // If status is OK, then return value back to caller
+            if (v.status === PhoneGap.callbackStatus.OK) {
+
+                // If there is a success callback, then call it now with
+                // returned value
                if (success) {
                    try {
-                       	success(v.message);
-                    }
-                    catch (e) {
-                        console.log("Error in success callback: "+callbackId+" = "+e);
+                        success(v.message);
+                    } catch (e) {
+                        console.log("Error in success callback: " + callbackId  + " = " + e);
                    }

                    // Clear callback if not expecting any more results
@@ -460,8 +591,8 @@ PhoneGap.exec = function(success, fail, service, action, args) {
            }

            // If no result
-            else if (v.status == PhoneGap.callbackStatus.NO_RESULT) {
-                    
+            else if (v.status === PhoneGap.callbackStatus.NO_RESULT) {
+
                // Clear callback if not expecting any more results
                if (!v.keepCallback) {
                    delete PhoneGap.callbacks[callbackId];
@@ -470,15 +601,15 @@ PhoneGap.exec = function(success, fail, service, action, args) {

            // If error, then display error
            else {
-                console.log("Error: Status="+r.status+" Message="+v.message);
+                console.log("Error: Status="+v.status+" Message="+v.message);

                // If there is a fail callback, then call it now with returned value
                if (fail) {
                    try {
                        fail(v.message);
                    }
-                    catch (e) {
-                        console.log("Error in error callback: "+callbackId+" = "+e);
+                    catch (e1) {
+                        console.log("Error in error callback: "+callbackId+" = "+e1);
                    }

                    // Clear callback if not expecting any more results
@@ -489,8 +620,8 @@ PhoneGap.exec = function(success, fail, service, action, args) {
                return null;
            }
        }
-    } catch (e) {
-        console.log("Error: "+e);
+    } catch (e2) {
+        console.log("Error: "+e2);
    }
 };

@@ -504,17 +635,17 @@ PhoneGap.callbackSuccess = function(callbackId, args) {
    if (PhoneGap.callbacks[callbackId]) {

        // If result is to be sent to callback
-        if (args.status == PhoneGap.callbackStatus.OK) {
+        if (args.status === PhoneGap.callbackStatus.OK) {
            try {
                if (PhoneGap.callbacks[callbackId].success) {
-               		PhoneGap.callbacks[callbackId].success(args.message);
+                    PhoneGap.callbacks[callbackId].success(args.message);
                }
            }
            catch (e) {
                console.log("Error in success callback: "+callbackId+" = "+e);
            }
        }
-    
+
        // Clear callback if not expecting any more results
        if (!args.keepCallback) {
            delete PhoneGap.callbacks[callbackId];
@@ -538,7 +669,7 @@ PhoneGap.callbackError = function(callbackId, args) {
        catch (e) {
            console.log("Error in error callback: "+callbackId+" = "+e);
        }
-        
+
        // Clear callback if not expecting any more results
        if (!args.keepCallback) {
            delete PhoneGap.callbacks[callbackId];
@@ -556,38 +687,43 @@ PhoneGap.callbackError = function(callbackId, args) {
 */
 // TODO: Is this used?
 PhoneGap.run_command = function() {
-    if (!PhoneGap.available || !PhoneGap.queue.ready)
+    if (!PhoneGap.available || !PhoneGap.queue.ready) {
        return;
-
+    }
    PhoneGap.queue.ready = false;

    var args = PhoneGap.queue.commands.shift();
-    if (PhoneGap.queue.commands.length == 0) {
+    if (PhoneGap.queue.commands.length === 0) {
        clearInterval(PhoneGap.queue.timer);
        PhoneGap.queue.timer = null;
    }

    var uri = [];
    var dict = null;
-    for (var i = 1; i < args.length; i++) {
+    var i;
+    for (i = 1; i < args.length; i++) {
        var arg = args[i];
-        if (arg == undefined || arg == null)
+        if (arg === undefined || arg === null) {
            arg = '';
-        if (typeof(arg) == 'object')
+        }
+        if (typeof(arg) === 'object') {
            dict = arg;
-        else
+        } else {
            uri.push(encodeURIComponent(arg));
+        }
    }
    var url = "gap://" + args[0] + "/" + uri.join("/");
-    if (dict != null) {
+    if (dict !== null) {
+        var name;
        var query_args = [];
-        for (var name in dict) {
-            if (typeof(name) != 'string')
-                continue;
-            query_args.push(encodeURIComponent(name) + "=" + encodeURIComponent(dict[name]));
+        for (name in dict) {
+            if (dict.hasOwnProperty(name) && (typeof (name) === 'string')) {
+                query_args.push(encodeURIComponent(name) + "=" + encodeURIComponent(dict[name]));
+            }
        }
-        if (query_args.length > 0)
+        if (query_args.length > 0) {
            url += "?" + query_args.join("&");
+        }
    }
    document.location = url;

@@ -599,21 +735,39 @@ PhoneGap.JSCallbackToken = null;
 /**
 * This is only for Android.
 *
- * Internal function that uses XHR to call into PhoneGap Java code and retrieve 
+ * Internal function that uses XHR to call into PhoneGap Java code and retrieve
 * any JavaScript code that needs to be run.  This is used for callbacks from
 * Java to JavaScript.
 */
 PhoneGap.JSCallback = function() {
+
+    // Exit if shutting down app
+    if (PhoneGap.shuttingDown) {
+        return;
+    }
+
+    // If polling flag was changed, start using polling from now on
+    if (PhoneGap.UsePolling) {
+        PhoneGap.JSCallbackPolling();
+        return;
+    }
+
    var xmlhttp = new XMLHttpRequest();

    // Callback function when XMLHttpRequest is ready
    xmlhttp.onreadystatechange=function(){
-        if(xmlhttp.readyState == 4){
+        if(xmlhttp.readyState === 4){
+
+            // Exit if shutting down app
+            if (PhoneGap.shuttingDown) {
+                return;
+            }

            // If callback has JavaScript statement to execute
-            if (xmlhttp.status == 200) {
+            if (xmlhttp.status === 200) {

-                var msg = xmlhttp.responseText;
+                // Need to url decode the response
+                var msg = decodeURIComponent(xmlhttp.responseText);
                setTimeout(function() {
                    try {
                        var t = eval(msg);
@@ -628,41 +782,39 @@ PhoneGap.JSCallback = function() {
            }

            // If callback ping (used to keep XHR request from timing out)
-            else if (xmlhttp.status == 404) {
+            else if (xmlhttp.status === 404) {
                setTimeout(PhoneGap.JSCallback, 10);
            }

            // If security error
-            else if (xmlhttp.status == 403) {
+            else if (xmlhttp.status === 403) {
                console.log("JSCallback Error: Invalid token.  Stopping callbacks.");
            }

            // If server is stopping
-            else if (xmlhttp.status == 503) {
+            else if (xmlhttp.status === 503) {
                console.log("JSCallback Error: Service unavailable.  Stopping callbacks.");
            }

            // If request wasn't GET
-            else if (xmlhttp.status == 400) {
+            else if (xmlhttp.status === 400) {
                console.log("JSCallback Error: Bad request.  Stopping callbacks.");
            }

-            // If error, restart callback server
+            // If error, revert to polling
            else {
                console.log("JSCallback Error: Request failed.");
-                CallbackServer.restartServer();
-                PhoneGap.JSCallbackPort = null;
-                PhoneGap.JSCallbackToken = null;
-                setTimeout(PhoneGap.JSCallback, 100);
+                PhoneGap.UsePolling = true;
+                PhoneGap.JSCallbackPolling();
            }
        }
-    }
+    };

-    if (PhoneGap.JSCallbackPort == null) {
-        PhoneGap.JSCallbackPort = CallbackServer.getPort();
+    if (PhoneGap.JSCallbackPort === null) {
+        PhoneGap.JSCallbackPort = prompt("getPort", "gap_callbackServer:");
    }
-    if (PhoneGap.JSCallbackToken == null) {
-        PhoneGap.JSCallbackToken = CallbackServer.getToken();
+    if (PhoneGap.JSCallbackToken === null) {
+        PhoneGap.JSCallbackToken = prompt("getToken", "gap_callbackServer:");
    }
    xmlhttp.open("GET", "http://127.0.0.1:"+PhoneGap.JSCallbackPort+"/"+PhoneGap.JSCallbackToken , true);
    xmlhttp.send();
@@ -674,15 +826,32 @@ PhoneGap.JSCallback = function() {
 */
 PhoneGap.JSCallbackPollingPeriod = 50;

+/**
+ * Flag that can be set by the user to force polling to be used or force XHR to be used.
+ */
+PhoneGap.UsePolling = false;    // T=use polling, F=use XHR
+
 /**
 * This is only for Android.
 *
- * Internal function that uses polling to call into PhoneGap Java code and retrieve 
+ * Internal function that uses polling to call into PhoneGap Java code and retrieve
 * any JavaScript code that needs to be run.  This is used for callbacks from
 * Java to JavaScript.
 */
 PhoneGap.JSCallbackPolling = function() {
-    var msg = CallbackServer.getJavascript();
+
+    // Exit if shutting down app
+    if (PhoneGap.shuttingDown) {
+        return;
+    }
+
+    // If polling flag was changed, stop using polling from now on
+    if (!PhoneGap.UsePolling) {
+        PhoneGap.JSCallback();
+        return;
+    }
+
+    var msg = prompt("", "gap_poll:");
    if (msg) {
        setTimeout(function() {
            try {
@@ -703,7 +872,7 @@ PhoneGap.JSCallbackPolling = function() {
 /**
 * Create a UUID
 *
- * @return
+ * @return {String}
 */
 PhoneGap.createUUID = function() {
    return PhoneGap.UUIDcreatePart(4) + '-' +
@@ -715,9 +884,10 @@ PhoneGap.createUUID = function() {

 PhoneGap.UUIDcreatePart = function(length) {
    var uuidpart = "";
-    for (var i=0; i<length; i++) {
-        var uuidchar = parseInt((Math.random() * 256)).toString(16);
-        if (uuidchar.length == 1) {
+    var i, uuidchar;
+    for (i=0; i<length; i++) {
+        uuidchar = parseInt((Math.random() * 256),0).toString(16);
+        if (uuidchar.length === 1) {
            uuidchar = "0" + uuidchar;
        }
        uuidpart += uuidchar;
@@ -729,11 +899,11 @@ PhoneGap.close = function(context, func, params) {
    if (typeof params === 'undefined') {
        return function() {
            return func.apply(context, arguments);
-        }
+        };
    } else {
        return function() {
            return func.apply(context, params);
-        }
+        };
    }
 };

@@ -744,12 +914,14 @@ PhoneGap.close = function(context, func, params) {
 * @param {Function} successCallback    The callback to call when the file has been loaded.
 */
 PhoneGap.includeJavascript = function(jsfile, successCallback) {
-    var id = document.getElementsByTagName("head")[0];         
+    var id = document.getElementsByTagName("head")[0];
    var el = document.createElement('script');
    el.type = 'text/javascript';
-    if (typeof successCallback == 'function') {
+    if (typeof successCallback === 'function') {
        el.onload = successCallback;
    }
    el.src = jsfile;
    id.appendChild(el);
 };
+
+}
--- a/framework/assets/js/position.js
+++ b/framework/assets/js/position.js
@@ -3,9 +3,12 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

+if (!PhoneGap.hasResource("position")) {
+PhoneGap.addResource("position");
+
 /**
 * This class contains position information.
 * @param {Object} lat
@@ -17,12 +20,13 @@
 * @param {Object} vel
 * @constructor
 */
-function Position(coords, timestamp) {
+var Position = function(coords, timestamp) {
 	this.coords = coords;
-	this.timestamp = (timestamp != 'undefined') ? timestamp : new Date().getTime();
-}
+	this.timestamp = (timestamp !== 'undefined') ? timestamp : new Date().getTime();
+};

-function Coordinates(lat, lng, alt, acc, head, vel, altacc) {
+/** @constructor */
+var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
 	/**
 	 * The latitude of the position.
 	 */
@@ -50,14 +54,14 @@ function Coordinates(lat, lng, alt, acc, head, vel, altacc) {
 	/**
 	 * The altitude accuracy of the position.
 	 */
-	this.altitudeAccuracy = (altacc != 'undefined') ? altacc : null; 
-}
+	this.altitudeAccuracy = (altacc !== 'undefined') ? altacc : null;
+};

 /**
 * This class specifies the options for requesting position data.
 * @constructor
 */
-function PositionOptions() {
+var PositionOptions = function() {
 	/**
 	 * Specifies the desired position accuracy.
 	 */
@@ -67,18 +71,19 @@ function PositionOptions() {
 	 * is called.
 	 */
 	this.timeout = 10000;
-}
+};

 /**
 * This class contains information about any GSP errors.
 * @constructor
 */
-function PositionError() {
+var PositionError = function() {
 	this.code = null;
 	this.message = "";
-}
+};

 PositionError.UNKNOWN_ERROR = 0;
 PositionError.PERMISSION_DENIED = 1;
 PositionError.POSITION_UNAVAILABLE = 2;
 PositionError.TIMEOUT = 3;
+}
--- a/framework/assets/js/storage.js
+++ b/framework/assets/js/storage.js
@@ -3,7 +3,7 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 *
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */

 /*
@@ -12,9 +12,42 @@
 * most manufacturers ship with Android 1.5 and do not do OTA Updates, this is required
 */

+if (!PhoneGap.hasResource("storage")) {
+PhoneGap.addResource("storage");
+
+/**
+ * SQL result set object
+ * PRIVATE METHOD
+ * @constructor
+ */
+var DroidDB_Rows = function() {
+    this.resultSet = [];    // results array
+    this.length = 0;        // number of rows
+};
+
+/**
+ * Get item from SQL result set
+ *
+ * @param row           The row number to return
+ * @return              The row object
+ */
+DroidDB_Rows.prototype.item = function(row) {
+    return this.resultSet[row];
+};
+
+/**
+ * SQL result set that is returned to user.
+ * PRIVATE METHOD
+ * @constructor
+ */
+var DroidDB_Result = function() {
+    this.rows = new DroidDB_Rows();
+};
+
 /**
 * Storage object that is called by native code when performing queries.
 * PRIVATE METHOD
+ * @constructor
 */
 var DroidDB = function() {
    this.queryQueue = {};
@@ -45,7 +78,7 @@ DroidDB.prototype.completeQuery = function(id, data) {
                r.rows.resultSet = data;
                r.rows.length = data.length;
                try {
-                    if (typeof query.successCallback == 'function') {
+                    if (typeof query.successCallback === 'function') {
                        query.successCallback(query.tx, r);
                    }
                } catch (ex) {
@@ -83,7 +116,7 @@ DroidDB.prototype.fail = function(reason, id) {
                tx.queryList = {};

                try {
-                    if (typeof query.errorCallback == 'function') {
+                    if (typeof query.errorCallback === 'function') {
                        query.errorCallback(query.tx, reason);
                    }
                } catch (ex) {
@@ -99,38 +132,40 @@ DroidDB.prototype.fail = function(reason, id) {
    }
 };

-var DatabaseShell = function() {
-};
-
 /**
- * Start a transaction.
- * Does not support rollback in event of failure.
+ * SQL query object
+ * PRIVATE METHOD
 *
- * @param process {Function}            The transaction function
- * @param successCallback {Function}
- * @param errorCallback {Function}
+ * @constructor
+ * @param tx                The transaction object that this query belongs to
 */
-DatabaseShell.prototype.transaction = function(process, errorCallback, successCallback) {
-    var tx = new DroidDB_Tx();
-    tx.successCallback = successCallback;
-    tx.errorCallback = errorCallback;
-    try {
-        process(tx);
-    } catch (e) {
-        console.log("Transaction error: "+e);
-        if (tx.errorCallback) {
-            try {
-                tx.errorCallback(e);
-            } catch (ex) {
-                console.log("Transaction error calling user error callback: "+e);
-            }
-        }
-    }
+var DroidDB_Query = function(tx) {
+
+    // Set the id of the query
+    this.id = PhoneGap.createUUID();
+
+    // Add this query to the queue
+    droiddb.queryQueue[this.id] = this;
+
+    // Init result
+    this.resultSet = [];
+
+    // Set transaction that this query belongs to
+    this.tx = tx;
+
+    // Add this query to transaction list
+    this.tx.queryList[this.id] = this;
+
+    // Callbacks
+    this.successCallback = null;
+    this.errorCallback = null;
+
 };

 /**
 * Transaction object
 * PRIVATE METHOD
+ * @constructor
 */
 var DroidDB_Tx = function() {

@@ -157,10 +192,13 @@ DroidDB_Tx.prototype.queryComplete = function(id) {
    // If no more outstanding queries, then fire transaction success
    if (this.successCallback) {
        var count = 0;
-        for (var i in this.queryList) {
-            count++;
+        var i;
+        for (i in this.queryList) {
+            if (this.queryList.hasOwnProperty(i)) {
+                count++;
+            }
        }
-        if (count == 0) {
+        if (count === 0) {
            try {
                this.successCallback();
            } catch(e) {
@@ -193,35 +231,6 @@ DroidDB_Tx.prototype.queryFailed = function(id, reason) {
    }
 };

-/**
- * SQL query object
- * PRIVATE METHOD
- *
- * @param tx                The transaction object that this query belongs to
- */
-var DroidDB_Query = function(tx) {
-
-    // Set the id of the query
-    this.id = PhoneGap.createUUID();
-
-    // Add this query to the queue
-    droiddb.queryQueue[this.id] = this;
-
-    // Init result
-    this.resultSet = [];
-
-    // Set transaction that this query belongs to
-    this.tx = tx;
-
-    // Add this query to transaction list
-    this.tx.queryList[this.id] = this;
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-}
-
 /**
 * Execute SQL statement
 *
@@ -233,7 +242,7 @@ var DroidDB_Query = function(tx) {
 DroidDB_Tx.prototype.executeSql = function(sql, params, successCallback, errorCallback) {

    // Init params array
-    if (typeof params == 'undefined') {
+    if (typeof params === 'undefined') {
        params = [];
    }

@@ -249,31 +258,33 @@ DroidDB_Tx.prototype.executeSql = function(sql, params, successCallback, errorCa
    PhoneGap.exec(null, null, "Storage", "executeSql", [sql, params, query.id]);
 };

-/**
- * SQL result set that is returned to user.
- * PRIVATE METHOD
- */
-DroidDB_Result = function() {
-    this.rows = new DroidDB_Rows();
+var DatabaseShell = function() {
 };

 /**
- * SQL result set object
- * PRIVATE METHOD
- */
-DroidDB_Rows = function() {
-    this.resultSet = [];    // results array
-    this.length = 0;        // number of rows
-};
-
-/**
- * Get item from SQL result set
+ * Start a transaction.
+ * Does not support rollback in event of failure.
 *
- * @param row           The row number to return
- * @return              The row object
+ * @param process {Function}            The transaction function
+ * @param successCallback {Function}
+ * @param errorCallback {Function}
 */
-DroidDB_Rows.prototype.item = function(row) {
-    return this.resultSet[row];
+DatabaseShell.prototype.transaction = function(process, errorCallback, successCallback) {
+    var tx = new DroidDB_Tx();
+    tx.successCallback = successCallback;
+    tx.errorCallback = errorCallback;
+    try {
+        process(tx);
+    } catch (e) {
+        console.log("Transaction error: "+e);
+        if (tx.errorCallback) {
+            try {
+                tx.errorCallback(e);
+            } catch (ex) {
+                console.log("Transaction error calling user error callback: "+e);
+            }
+        }
+    }
 };

 /**
@@ -285,77 +296,133 @@ DroidDB_Rows.prototype.item = function(row) {
 * @param size              Database size in bytes
 * @return                  Database object
 */
-DroidDB_openDatabase = function(name, version, display_name, size) {
+var DroidDB_openDatabase = function(name, version, display_name, size) {
    PhoneGap.exec(null, null, "Storage", "openDatabase", [name, version, display_name, size]);
    var db = new DatabaseShell();
    return db;
 };

-
 /**
- * For browsers with no localStorage we emulate it with SQLite. Follows the w3c api. 
- * TODO: Do similar for sessionStorage. 
+ * For browsers with no localStorage we emulate it with SQLite. Follows the w3c api.
+ * TODO: Do similar for sessionStorage.
 */

+/**
+ * @constructor
+ */
 var CupcakeLocalStorage = function() {
 		try {

-			this.db = openDatabase('localStorage', '1.0', 'localStorage', 2621440);	
+			this.db = openDatabase('localStorage', '1.0', 'localStorage', 2621440);
 			var storage = {};
+			this.length = 0;
+			function setLength (length) {
+				this.length = length;
+				localStorage.length = length;
+			}
 			this.db.transaction(
 				function (transaction) {
+				    var i;
 					transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
 					transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
-	                    for(var i = 0; i < result.rows.length; i++) {
+						for(var i = 0; i < result.rows.length; i++) {
 							storage[result.rows.item(i)['id']] =  result.rows.item(i)['body'];
 						}
+						setLength(result.rows.length);
+						PhoneGap.initializationComplete("cupcakeStorage");
 					});
-					
-				}, 
+
+				},
 				function (err) {
 					alert(err.message);
 				}
 			);
 			this.setItem = function(key, val) {
-				console.log('set');
+				if (typeof(storage[key])=='undefined') {
+					this.length++;
+				}
 				storage[key] = val;
-				
 				this.db.transaction(
 					function (transaction) {
 						transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-						
 						transaction.executeSql('REPLACE INTO storage (id, body) values(?,?)', [key,val]);
 					}
 				);
-			}
-			this.getItem = function(key) {			
+			};
+			this.getItem = function(key) {
 				return storage[key];
-			}
+			};
 			this.removeItem = function(key) {
 				delete storage[key];
+				this.length--;
 				this.db.transaction(
 					function (transaction) {
 						transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-						
 						transaction.executeSql('DELETE FROM storage where id=?', [key]);
 					}
 				);
-				
-			}
-				
+			};
+			this.clear = function() {
+				storage = {};
+				this.length = 0;
+				this.db.transaction(
+					function (transaction) {
+						transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
+						transaction.executeSql('DELETE FROM storage', []);
+					}
+				);
+			};
+			this.key = function(index) {
+				var i = 0;
+				for (var j in storage) {
+					if (i==index) {
+						return j;
+					} else {
+						i++;
+					}
+				}
+				return null;
+			};
+
 		} catch(e) {
 			alert("Database error "+e+".");
 		    return;
 		}
 };
+
 PhoneGap.addConstructor(function() {
-	if (typeof window.openDatabase == "undefined") {
+    var setupDroidDB = function() {
        navigator.openDatabase = window.openDatabase = DroidDB_openDatabase;
        window.droiddb = new DroidDB();
    }
+    if (typeof window.openDatabase === "undefined") {
+        setupDroidDB();
+    } else {
+        window.openDatabase_orig = window.openDatabase;
+        window.openDatabase = function(name, version, desc, size){
+            // Some versions of Android will throw a SECURITY_ERR so we need 
+            // to catch the exception and seutp our own DB handling.
+            var db = null;
+            try {
+                db = window.openDatabase_orig(name, version, desc, size);
+            } 
+            catch (ex) {
+                db = null;
+            }
+
+            if (db == null) {
+                setupDroidDB();
+                return DroidDB_openDatabase(name, version, desc, size);
+            }
+            else {
+                return db;
+            }
+        }
+    }
    
-    if (typeof window.localStorage == "undefined") {
+    if (typeof window.localStorage === "undefined") {
        navigator.localStorage = window.localStorage = new CupcakeLocalStorage();
+        PhoneGap.waitForInitialization("cupcakeStorage");
    }
 });
-
+}
--- a/framework/assets/www/index.html
+++ b/framework/assets/www/index.html
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title></title>
+    <script src="phonegap-1.0.0rc3.js"></script>
+  </head>
+  <body>
+
+  </body>
+</html>
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="PhoneGap" default="help">
+<project name="PhoneGap" default="jar">
+
+    <!-- LOAD VERSION -->
+    <loadfile property="version" srcFile="../VERSION">
+        <filterchain>
+            <striplinebreaks/>
+        </filterchain>
+    </loadfile>

    <!-- The local.properties file is created and updated by the 'android' tool.
         It contains the path to the SDK. It should *NOT* be checked in in Version
@@ -33,6 +40,9 @@
         This file is an integral part of the build system for your application and
         should be checked in in Version Control Systems. -->
    <property file="default.properties" />
+    
+    <!-- We need to setup the double quote. -->
+    <property name="dblQuote">"</property>

    <!-- Custom Android task to deal with the project target, and import the proper rules.
         This requires ant 1.6.0 or above. -->
@@ -64,76 +74,57 @@
    -->
    <setup />

-	<target name="check-javascript" depends="build-javascript">
-		<delete dir="assets/lib"/>
-		<mkdir dir="assets/lib"/>
-		<echo file="assets/lib/lint.js">var alert=function(){},device={},Element={},debug={};</echo>
-		<concat destfile="assets/lib/phonegap-lint.js" append="true">
-			<fileset dir="assets/lib">
-				<include name="lint.js" />
-			</fileset>
-			<fileset dir="assets/www">
-				<include name="phonegap.js" />
-			</fileset>
-		</concat>
+    <target name="check-javascript" depends="build-javascript">
+        <delete dir="assets/lib"/>
+        <mkdir dir="assets/lib"/>
+        <echo file="assets/lib/lint.js">var alert=function(){},device={},Element={},debug={};</echo>
+        <concat destfile="assets/lib/phonegap-lint.js" append="true">
+            <fileset dir="assets/lib">
+                <include name="lint.js" />
+            </fileset>
+            <fileset dir="assets/www">
+                <include name="phonegap-${version}.js" />
+            </fileset>
+        </concat>

-		<exec executable="cmd" os="Windows 7">
-			<arg value="/c"/>
-			<arg value="java"/>
-			<arg value="-cp"/>
-			<arg value="${basedir}/util/js.jar"/>
-			<arg value="org.mozilla.javascript.tools.shell.Main"/>
-			<arg value="${basedir}/util/jslint.js"/>
-			<arg value="${basedir}/js/lib/phonegap-lint.js"/>
-		</exec>
-		<exec executable="java" os="Mac OS X">
-			<arg value="-cp"/>
-			<arg value="../util/js.jar"/>
-			<arg value="org.mozilla.javascript.tools.shell.Main"/>
-			<arg value="../util/jslint.js"/>
-			<arg value="assets/lib/phonegap-lint.js"/>
-		</exec>
-	</target>
-
-    <!-- Combine JavaScript files into one phonegap.js file.
-         This task does not create a compressed JavaScript file. -->
-    <target name="build-uncompressed-javascript">
-
-      <!-- Clean up existing files -->
-      <delete file="assets/www/phonegap.js"/>
-      <delete file="assets/www/phonegap-tmp.js"/>
-      <delete file="assets/www/phonegap-uncompressed.js"/>
-      
-      <!-- Create uncompressed JS file -->
-      <concat destfile="assets/www/phonegap.js">
-        <fileset dir="assets/js" includes="phonegap.js.base" />
-        <fileset dir="assets/js" includes="*.js" />
-      </concat>
+        <exec executable="cmd" os="Windows 7">
+            <arg value="/c"/>
+            <arg value="java"/>
+            <arg value="-cp"/>
+            <arg value="${basedir}/util/js.jar"/>
+            <arg value="org.mozilla.javascript.tools.shell.Main"/>
+            <arg value="${basedir}/util/jslint.js"/>
+            <arg value="${basedir}/js/lib/phonegap-lint.js"/>
+        </exec>
+        <exec executable="java" os="Mac OS X">
+            <arg value="-cp"/>
+            <arg value="../util/js.jar"/>
+            <arg value="org.mozilla.javascript.tools.shell.Main"/>
+            <arg value="../util/jslint.js"/>
+            <arg value="assets/lib/phonegap-lint.js"/>
+        </exec>
    </target>
-    
-    <!-- Combine JavaScript files into one phonegap-uncompressed.js file.
-         Compress this file using yuicompressor to create phonegap.js.  -->
+
+    <!-- Combine JavaScript files into one phonegap-uncompressed.js file. -->
    <target name="build-javascript">
        
      <!-- Clean up existing files -->
-      <delete file="assets/www/phonegap.js"/>
-      <delete file="assets/www/phonegap-tmp.js"/>
-      <delete file="assets/www/phonegap-uncompressed.js"/>
+      <delete file="assets/www/phonegap_${version}.js"/>
        
      <!-- Create uncompressed JS file -->
-      <concat destfile="assets/www/phonegap-uncompressed.js">
+      <concat destfile="assets/www/phonegap-${version}.js">
        <fileset dir="assets/js" includes="phonegap.js.base" />
        <fileset dir="assets/js" includes="*.js" />
      </concat>

-      <!-- Compress JS file -->
-      <java jar="${basedir}/../util/yuicompressor/yuicompressor-2.4.2.jar" fork="true" failonerror="true">
-        <arg line="--nomunge -o assets/www/phonegap-tmp.js assets/www/phonegap-uncompressed.js"/>
-      </java>
-      <concat destfile="assets/www/phonegap.js">
-        <fileset dir="assets/js" includes="header.txt" />
-        <fileset dir="assets/www" includes="phonegap-tmp.js" />
-      </concat>
+      <!-- update project files to reference phonegap-x.x.x.min.js -->
+      <replaceregexp match="phonegap(.*)\.js" replace="phonegap-${version}.js" byline="true">
+        <fileset file="assets/www/index.html" />
+        <fileset file="../example/index.html" />
+      </replaceregexp>
+      <replaceregexp match="phonegapVersion = [\u0022].*[\u0022];" replace="phonegapVersion = ${dblQuote}${version}${dblQuote};" byline="true">
+        <fileset file="src/com/phonegap/Device.java" />
+      </replaceregexp>
        
      <!-- Delete temp file -->
      <delete file="assets/www/phonegap-tmp.js"/>
@@ -141,14 +132,9 @@

    <!-- Build PhoneGap jar file that includes all native code, and PhoneGap JS file
         that includes all JavaScript code.
-      
-         The default is to compress the JavaScript code using yuicompressor.
-      
-         If you want uncompressed JavaScript, change 
-            "build-javascript" => "build-uncompressed-javascript".
    -->
    <target name="jar" depends="build-javascript, compile">
-      <jar jarfile="phonegap.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
+      <jar jarfile="phonegap-${version}.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
    </target>

    <target name="phonegap_debug" depends="build-javascript, debug">
--- a/framework/default.properties
+++ b/framework/default.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-8
+target=android-12
 apk-configurations=
--- a/framework/gen/com/phonegap/R.java
+++ b/framework/gen/com/phonegap/R.java
@@ -1,27 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package com.phonegap;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int icon=0x7f020000;
-        public static final int splash=0x7f020001;
-    }
-    public static final class id {
-        public static final int appView=0x7f050000;
-    }
-    public static final class layout {
-        public static final int main=0x7f030000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int go=0x7f040001;
-    }
-}
--- a/framework/res/xml/plugins.xml
+++ b/framework/res/xml/plugins.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<plugins>
+    <plugin name="App" value="com.phonegap.App"/>
+    <plugin name="Geolocation" value="com.phonegap.GeoBroker"/>
+    <plugin name="Device" value="com.phonegap.Device"/>
+    <plugin name="Accelerometer" value="com.phonegap.AccelListener"/>
+    <plugin name="Compass" value="com.phonegap.CompassListener"/>
+    <plugin name="Media" value="com.phonegap.AudioHandler"/>
+    <plugin name="Camera" value="com.phonegap.CameraLauncher"/>
+    <plugin name="Contacts" value="com.phonegap.ContactManager"/>
+    <plugin name="Crypto" value="com.phonegap.CryptoHandler"/>
+    <plugin name="File" value="com.phonegap.FileUtils"/>
+    <plugin name="Network Status" value="com.phonegap.NetworkManager"/>
+    <plugin name="Notification" value="com.phonegap.Notification"/>
+    <plugin name="Storage" value="com.phonegap.Storage"/>
+    <plugin name="Temperature" value="com.phonegap.TempListener"/>
+    <plugin name="FileTransfer" value="com.phonegap.FileTransfer"/>
+    <plugin name="Capture" value="com.phonegap.Capture"/>
+</plugins>
--- a/framework/src/com/phonegap/App.java
+++ b/framework/src/com/phonegap/App.java
@@ -3,7 +3,7 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 * 
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */
 package com.phonegap;

@@ -12,12 +12,13 @@ import org.json.JSONException;
 import org.json.JSONObject;
 import com.phonegap.api.Plugin;
 import com.phonegap.api.PluginResult;
+import java.util.HashMap;

 /**
 * This class exposes methods in DroidGap that can be called from JavaScript.
 */
 public class App extends Plugin {
-	
+
    /**
     * Executes the request and returns PluginResult.
     *
@@ -43,8 +44,15 @@ public class App extends Plugin {
        	else if (action.equals("clearHistory")) {
            	this.clearHistory();
            }
-        	else if (action.equals("addService")) {
-            	this.addService(args.getString(0), args.getString(1));
+        	else if (action.equals("overrideBackbutton")) {
+            	this.overrideBackbutton(args.getBoolean(0));
+            }
+        	else if (action.equals("isBackbuttonOverridden")) {
+            	boolean b = this.isBackbuttonOverridden();
+            	return new PluginResult(status, b);
+            }
+        	else if (action.equals("exitApp")) {
+            	this.exitApp();
            }
            return new PluginResult(status, result);
        } catch (JSONException e) {
@@ -73,8 +81,11 @@ public class App extends Plugin {
 	public void loadUrl(String url, JSONObject props) throws JSONException {
 		System.out.println("App.loadUrl("+url+","+props+")");
 		int wait = 0;
-		
+		boolean usePhoneGap = true;
+		boolean clearPrev = false;
+
 		// If there are properties, then set them on the Activity
+		HashMap<String, Object> params = new HashMap<String, Object>();
 		if (props != null) {
 			JSONArray keys = props.names();
 			for (int i=0; i<keys.length(); i++) {
@@ -82,31 +93,42 @@ public class App extends Plugin {
 				if (key.equals("wait")) {
 					wait = props.getInt(key);
 				}
+				else if (key.equalsIgnoreCase("usephonegap")) {
+					usePhoneGap = props.getBoolean(key);
+				}
+				else if (key.equalsIgnoreCase("clearprev")) {
+					clearPrev = props.getBoolean(key);
+				}
 				else {
 					Object value = props.get(key);
 					if (value == null) {
-						
+
 					}
 					else if (value.getClass().equals(String.class)) {
-						this.ctx.getIntent().putExtra(key, (String)value);
+						params.put(key, (String)value);
 					}
 					else if (value.getClass().equals(Boolean.class)) {
-						this.ctx.getIntent().putExtra(key, (Boolean)value);
+						params.put(key, (Boolean)value);
 					}
 					else if (value.getClass().equals(Integer.class)) {
-						this.ctx.getIntent().putExtra(key, (Integer)value);
+						params.put(key, (Integer)value);
 					}
 				}
 			}
 		}
-		
+
 		// If wait property, then delay loading
+
 		if (wait > 0) {
-			((DroidGap)this.ctx).loadUrl(url, wait);
-		}
-		else {
-			((DroidGap)this.ctx).loadUrl(url);
+			try {
+				synchronized(this) {
+					this.wait(wait);
+				}
+			} catch (InterruptedException e) {
+				e.printStackTrace();
+			}
 		}
+		((DroidGap)this.ctx).showWebPage(url, usePhoneGap, clearPrev, params);
 	}

 	/**
@@ -124,12 +146,30 @@ public class App extends Plugin {
    }

    /**
-     * Add a class that implements a service.
+     * Override the default behavior of the Android back button.
+     * If overridden, when the back button is pressed, the "backKeyDown" JavaScript event will be fired.
     * 
-     * @param serviceType
-     * @param className
+     * @param override		T=override, F=cancel override
     */
-    public void addService(String serviceType, String className) {
-    	this.ctx.addService(serviceType, className);
+    public void overrideBackbutton(boolean override) {
+    	System.out.println("WARNING: Back Button Default Behaviour will be overridden.  The backbutton event will be fired!");
+    	((DroidGap)this.ctx).bound = override;
    }
+
+    /**
+     * Return whether the Android back button is overridden by the user.
+     * 
+     * @return boolean
+     */
+    public boolean isBackbuttonOverridden() {
+    	return ((DroidGap)this.ctx).bound;
+    }
+
+    /**
+     * Exit the Android application.
+     */
+    public void exitApp() {
+    	((DroidGap)this.ctx).finish();
+    }
+
 }
--- a/framework/src/com/phonegap/AudioHandler.java
+++ b/framework/src/com/phonegap/AudioHandler.java
@@ -63,6 +63,9 @@ public class AudioHandler extends Plugin {
 			else if (action.equals("startPlayingAudio")) {
 				this.startPlayingAudio(args.getString(0), args.getString(1));
 			}
+			else if (action.equals("seekToAudio")) {
+				this.seekToAudio(args.getString(0), args.getInt(1));
+			}
 			else if (action.equals("pausePlayingAudio")) {
 				this.pausePlayingAudio(args.getString(0));
 			}
@@ -70,12 +73,12 @@ public class AudioHandler extends Plugin {
 				this.stopPlayingAudio(args.getString(0));
 			}
 			else if (action.equals("getCurrentPositionAudio")) {
-				long l = this.getCurrentPositionAudio(args.getString(0));
-				return new PluginResult(status, l);
+				float f = this.getCurrentPositionAudio(args.getString(0));
+				return new PluginResult(status, f);
 			}
 			else if (action.equals("getDurationAudio")) {
-				long l = this.getDurationAudio(args.getString(0), args.getString(1));
-				return new PluginResult(status, l);
+				float f = this.getDurationAudio(args.getString(0), args.getString(1));
+				return new PluginResult(status, f);
 			}
 			else if (action.equals("release")) {
 				boolean b = this.release(args.getString(0));
@@ -181,6 +184,20 @@ public class AudioHandler extends Plugin {
    	audio.startPlaying(file);
    }

+    /**
+     * Seek to a location.
+     * 
+     * 
+	 * @param id				The id of the audio player
+	 * @param miliseconds		int: number of milliseconds to skip 1000 = 1 second
+     */
+    public void seekToAudio(String id, int milliseconds) {
+    	AudioPlayer audio = this.players.get(id);
+    	if (audio != null) {
+    		audio.seekToPlaying(milliseconds);
+    	}
+    }
+    
    /**
     * Pause playing.
     * 
@@ -213,10 +230,10 @@ public class AudioHandler extends Plugin {
 	 * @param id				The id of the audio player
     * @return 					position in msec
     */
-    public long getCurrentPositionAudio(String id) {
+    public float getCurrentPositionAudio(String id) {
    	AudioPlayer audio = this.players.get(id);
    	if (audio != null) {
-    		return(audio.getCurrentPosition());
+    		return(audio.getCurrentPosition()/1000.0f);
    	}
    	return -1;
    }
@@ -228,7 +245,7 @@ public class AudioHandler extends Plugin {
     * @param file				The name of the audio file.
     * @return					The duration in msec.
     */
-    public long getDurationAudio(String id, String file) {
+    public float getDurationAudio(String id, String file) {
    	
    	// Get audio file
    	AudioPlayer audio = this.players.get(id);
--- a/framework/src/com/phonegap/AudioPlayer.java
+++ b/framework/src/com/phonegap/AudioPlayer.java
@@ -11,10 +11,12 @@ import java.io.File;
 import java.io.IOException;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
-import android.media.MediaPlayer.OnErrorListener;
-import android.media.MediaRecorder;
 import android.media.MediaPlayer.OnCompletionListener;
+import android.media.MediaPlayer.OnErrorListener;
 import android.media.MediaPlayer.OnPreparedListener;
+import android.media.MediaRecorder;
+import android.os.Environment;
+import android.util.Log;

 /**
 * This class implements the audio playback and recording capabilities used by PhoneGap.
@@ -27,7 +29,9 @@ import android.media.MediaPlayer.OnPreparedListener;
 */
 public class AudioPlayer implements OnCompletionListener, OnPreparedListener, OnErrorListener {

-	// AudioPlayer states
+    private static final String LOG_TAG = "AudioPlayer";
+
+    // AudioPlayer states
 	private static int MEDIA_NONE = 0;
 	private static int MEDIA_STARTING = 1;
 	private static int MEDIA_RUNNING = 2;
@@ -37,6 +41,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	// AudioPlayer message ids
 	private static int MEDIA_STATE = 1;
 	private static int MEDIA_DURATION = 2;
+    private static int MEDIA_POSITION = 3;
 	private static int MEDIA_ERROR = 9;
 	
 	// AudioPlayer error codes
@@ -53,7 +58,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	private String id;								// The id of this player (used to identify Media object in JavaScript)
 	private int state = MEDIA_NONE;					// State of recording or playback
 	private String audioFile = null;				// File name to play or record to
-	private long duration = -1;						// Duration of audio
+	private float duration = -1;					// Duration of audio

 	private MediaRecorder recorder = null;			// Audio recording object
 	private String tempFile = null;					// Temporary recording file name
@@ -70,10 +75,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	public AudioPlayer(AudioHandler handler, String id) {
 		this.handler = handler;
 		this.id = id;
-		
-		// YES, I know this is bad, but I can't do it the right way because Google didn't have the
-		// foresight to add android.os.environment.getExternalDataDirectory until Android 2.2
-        this.tempFile = "/sdcard/tmprecording.mp3";
+        this.tempFile = Environment.getExternalStorageDirectory().getAbsolutePath() + "/tmprecording.mp3";
 	}	

 	/**
@@ -101,7 +103,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	 */
 	public void startRecording(String file) {
 		if (this.mPlayer != null) {
-			System.out.println("AudioPlayer Error: Can't record in play mode.");
+			Log.d(LOG_TAG, "AudioPlayer Error: Can't record in play mode.");
 			this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERROR_PLAY_MODE_SET+");");
 		}
 		
@@ -126,7 +128,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 			this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERROR_STARTING_RECORDING+");");			
 		}
 		else {
-			System.out.println("AudioPlayer Error: Already recording.");
+		    Log.d(LOG_TAG, "AudioPlayer Error: Already recording.");
 			this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERROR_ALREADY_RECORDING+");");			
 		}
 	}
@@ -168,7 +170,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
     */
 	public void startPlaying(String file) {
 		if (this.recorder != null) {
-			System.out.println("AudioPlayer Error: Can't play in record mode.");
+		    Log.d(LOG_TAG, "AudioPlayer Error: Can't play in record mode.");
 			this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERROR_RECORD_MODE_SET+");");
 		}
 		
@@ -209,7 +211,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 					this.mPlayer.prepare();

 					// Get duration
-					this.duration = this.mPlayer.getDuration();
+					this.duration = getDurationInSeconds();
 				}
 			} 
 			catch (Exception e) { 
@@ -227,12 +229,23 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 				this.setState(MEDIA_RUNNING);
 			}
 			else {
-				System.out.println("AudioPlayer Error: startPlaying() called during invalid state: "+this.state);
+			    Log.d(LOG_TAG, "AudioPlayer Error: startPlaying() called during invalid state: "+this.state);
 				this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERROR_RESUME_STATE+");");			
 			}
 		}
 	} 

+	/**
+	 * Seek or jump to a new time in the track.
+	 */
+	public void seekToPlaying(int milliseconds) {
+		if (this.mPlayer != null) {
+		    this.mPlayer.seekTo(milliseconds);
+		    Log.d(LOG_TAG, "Send a onStatus update for the new seek");
+		    this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_POSITION+", "+milliseconds/1000.0f+");");
+		}
+	}
+	
 	/**
 	 * Pause playing.
 	 */
@@ -244,7 +257,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 			this.setState(MEDIA_PAUSED);
 		}
 		else {
-			System.out.println("AudioPlayer Error: pausePlaying() called during invalid state: "+this.state);			
+		    Log.d(LOG_TAG, "AudioPlayer Error: pausePlaying() called during invalid state: "+this.state);			
 			this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERROR_PAUSE_STATE+");");			
 		}
 	}
@@ -258,7 +271,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 			this.setState(MEDIA_STOPPED);
 		}
 		else {
-			System.out.println("AudioPlayer Error: stopPlaying() called during invalid state: "+this.state);			
+		    Log.d(LOG_TAG, "AudioPlayer Error: stopPlaying() called during invalid state: "+this.state);			
 			this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_ERROR+", "+MEDIA_ERROR_STOP_STATE+");");			
 		}
 	}
@@ -279,7 +292,9 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
     */
 	public long getCurrentPosition() {
 		if ((this.state == MEDIA_RUNNING) || (this.state == MEDIA_PAUSED)) {
-			return this.mPlayer.getCurrentPosition();
+		    int curPos = this.mPlayer.getCurrentPosition();
+		    this.handler.sendJavascript("PhoneGap.Media.onStatus('" + this.id + "', "+MEDIA_POSITION+", "+curPos/1000.0f+");");
+			return curPos;
 		} 
 		else { 
 			return -1; 
@@ -310,7 +325,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
     * 							-1=can't be determined
     * 							-2=not allowed
     */
-	public long getDuration(String file) {
+	public float getDuration(String file) {
 		
 		// Can't get duration of recording
 		if (this.recorder != null) {
@@ -353,7 +368,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 		}
 		
 		// Save off duration
-		this.duration = this.mPlayer.getDuration();	
+		this.duration = getDurationInSeconds();	
 		this.prepareOnly = false;

 		// Send status notification to JavaScript
@@ -361,6 +376,15 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 		
 	}

+	/**
+	 * By default Android returns the length of audio in mills but we want seconds
+	 * 
+	 * @return length of clip in seconds
+	 */
+	private float getDurationInSeconds() {
+		return (this.mPlayer.getDuration() / 1000.0f);
+	}
+
 	/**
 	 * Callback to be invoked when there has been an error during an asynchronous operation
 	 *  (other errors will throw exceptions at method call time).
@@ -370,7 +394,7 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 	 * @param arg2				an extra code, specific to the error.
 	 */
 	public boolean onError(MediaPlayer mPlayer, int arg1, int arg2) {
-		System.out.println("AudioPlayer.onError(" + arg1 + ", " + arg2+")");
+	    Log.d(LOG_TAG, "AudioPlayer.onError(" + arg1 + ", " + arg2+")");

 		// TODO: Not sure if this needs to be sent?
 		this.mPlayer.stop();
@@ -393,5 +417,4 @@ public class AudioPlayer implements OnCompletionListener, OnPreparedListener, On
 		
 		this.state = state;
 	}
-
 }
--- a/framework/src/com/phonegap/BrowserKey.java
+++ b/framework/src/com/phonegap/BrowserKey.java
@@ -1,51 +0,0 @@
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- */
-package com.phonegap;
-
-import android.app.Activity;
-import android.util.Log;
-import android.webkit.WebView;
-
-/*
- * This class literally exists to protect DroidGap from Javascript directly.
- * 
- * 
- */
-
-public class BrowserKey {
-
-	DroidGap mAction;
-	boolean bound;
-	WebView mView;
-	
-	BrowserKey(WebView view, DroidGap action)
-	{
-		bound = false;
-		mAction = action;
-	}
-	
-	public void override()
-	{
-		Log.d("PhoneGap", "WARNING: Back Button Default Behaviour will be overridden.  The backKeyDown event will be fired!");
-		bound = true;
-	}
-	
-	public boolean isBound()
-	{
-		return bound;
-	}
-	
-	public void reset()
-	{
-		bound = false;
-	}
-	
-	public void exitApp()
-	{
-		mAction.finish();
-	}
-}
--- a/framework/src/com/phonegap/CallbackServer.java
+++ b/framework/src/com/phonegap/CallbackServer.java
@@ -11,10 +11,14 @@ import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.URLEncoder;
 import java.util.LinkedList;

+import android.util.Log;
+
 /**
 * This class provides a way for Java to run JavaScript in the web page that has loaded PhoneGap.
 * The CallbackServer class implements an XHR server and a polling server with a list of JavaScript
@@ -41,6 +45,8 @@ import java.util.LinkedList;
 */
 public class CallbackServer implements Runnable {
 	
+	private static final String LOG_TAG = "CallbackServer";
+
 	/**
 	 * The list of JavaScript statements to be sent to JavaScript.
 	 */
@@ -69,7 +75,7 @@ public class CallbackServer implements Runnable {
 	/**
 	 * Indicates that polling should be used instead of XHR.
 	 */
-	private boolean usePolling;
+	private boolean usePolling = true;
 	
 	/**
 	 * Security token to prevent other apps from accessing this callback server via XHR
@@ -188,54 +194,64 @@ public class CallbackServer implements Runnable {
 				 request = xhrReader.readLine();
 				 String response = "";
 				 //System.out.println("CallbackServerRequest="+request);
-				 if (request.contains("GET")) {
+				 if (this.active && (request != null)) {
+					 if (request.contains("GET")) {
+						 
+						 // Get requested file
+						 String[] requestParts = request.split(" "); 
+						 
+						 // Must have security token
+						 if ((requestParts.length == 3) && (requestParts[1].substring(1).equals(this.token))) {
+							 //System.out.println("CallbackServer -- Processing GET request");

-					 // Must have security token
-					 if (request.substring(5,41).equals(this.token)) {
-						 //System.out.println("CallbackServer -- Processing GET request");
-
-						 // Wait until there is some data to send, or send empty data every 10 sec 
-						 // to prevent XHR timeout on the client 
-						 synchronized (this) { 
-							 while (this.empty) { 
-								 try { 
-									 this.wait(10000); // prevent timeout from happening
-									 //System.out.println("CallbackServer>>> break <<<");
-									 break;
+							 // Wait until there is some data to send, or send empty data every 10 sec 
+							 // to prevent XHR timeout on the client 
+							 synchronized (this) { 
+								 while (this.empty) { 
+									 try { 
+										 this.wait(10000); // prevent timeout from happening
+										 //System.out.println("CallbackServer>>> break <<<");
+										 break;
+									 } 
+									 catch (Exception e) { }
 								 } 
-								 catch (Exception e) { }
-							 } 
-						 }
+							 }

-						 // If server is still running
-						 if (this.active) {
+							 // If server is still running
+							 if (this.active) {

-							 // If no data, then send 404 back to client before it times out
-							 if (this.empty) {
-								 //System.out.println("CallbackServer -- sending data 0");
-								 response = "HTTP/1.1 404 NO DATA\r\n\r\n "; // need to send content otherwise some Android devices fail, so send space
+								 // If no data, then send 404 back to client before it times out
+								 if (this.empty) {
+									 //System.out.println("CallbackServer -- sending data 0");
+									 response = "HTTP/1.1 404 NO DATA\r\n\r\n "; // need to send content otherwise some Android devices fail, so send space
+								 }
+								 else {
+									 //System.out.println("CallbackServer -- sending item");
+									 response = "HTTP/1.1 200 OK\r\n\r\n";
+									 String js = this.getJavascript();
+									 if (js != null) {
+										 response += encode(js, "UTF-8");
+									 }
+								 }
 							 }
 							 else {
-								 //System.out.println("CallbackServer -- sending item");
-								 response = "HTTP/1.1 200 OK\r\n\r\n"+this.getJavascript();
+								 response = "HTTP/1.1 503 Service Unavailable\r\n\r\n ";							 
 							 }
 						 }
 						 else {
-							 response = "HTTP/1.1 503 Service Unavailable\r\n\r\n ";							 
+							 response = "HTTP/1.1 403 Forbidden\r\n\r\n ";						 
 						 }
 					 }
 					 else {
-						 response = "HTTP/1.1 403 Forbidden\r\n\r\n ";						 
+						 response = "HTTP/1.1 400 Bad Request\r\n\r\n ";
 					 }
+					 //System.out.println("CallbackServer: response="+response);
+					 //System.out.println("CallbackServer: closing output");
+					 output.writeBytes(response);
+					 output.flush();
 				 }
-				 else {
-					 response = "HTTP/1.1 400 Bad Request\r\n\r\n ";
-				 }
-				 //System.out.println("CallbackServer: response="+response);
-				 //System.out.println("CallbackServer: closing output");
-				 output.writeBytes(response);
-				 output.flush();
-				 output.close();				 
+				 output.close();
+				 xhrReader.close();
 			 }
 		 } catch (IOException e) {
 			 e.printStackTrace();
@@ -311,4 +327,81 @@ public class CallbackServer implements Runnable {
 		}
 	}
 	
+	/* The Following code has been modified from original implementation of URLEncoder */
+	
+	/* start */
+	
+	/*
+     *  Licensed to the Apache Software Foundation (ASF) under one or more
+     *  contributor license agreements.  See the NOTICE file distributed with
+     *  this work for additional information regarding copyright ownership.
+     *  The ASF licenses this file to You under the Apache License, Version 2.0
+     *  (the "License"); you may not use this file except in compliance with
+     *  the License.  You may obtain a copy of the License at
+     *
+     *     http://www.apache.org/licenses/LICENSE-2.0
+     *
+     *  Unless required by applicable law or agreed to in writing, software
+     *  distributed under the License is distributed on an "AS IS" BASIS,
+     *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     *  See the License for the specific language governing permissions and
+     *  limitations under the License.
+     */
+	static final String digits = "0123456789ABCDEF";
+
+    /**
+     * This will encode the return value to JavaScript.  We revert the encoding for 
+     * common characters that don't require encoding to reduce the size of the string 
+     * being passed to JavaScript.
+     * 
+     * @param s to be encoded
+     * @param enc encoding type
+     * @return encoded string
+     */
+	public static String encode(String s, String enc) throws UnsupportedEncodingException {
+        if (s == null || enc == null) {
+            throw new NullPointerException();
+        }
+        // check for UnsupportedEncodingException
+        "".getBytes(enc);
+        
+        // Guess a bit bigger for encoded form
+        StringBuilder buf = new StringBuilder(s.length() + 16);
+        int start = -1;
+        for (int i = 0; i < s.length(); i++) {
+            char ch = s.charAt(i);
+            if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z')
+                    || (ch >= '0' && ch <= '9')
+                    || " .-*_'(),<>=?@[]{}:~\"\\/;!".indexOf(ch) > -1) {
+                if (start >= 0) {
+                    convert(s.substring(start, i), buf, enc);
+                    start = -1;
+                }
+                if (ch != ' ') {
+                    buf.append(ch);
+                } else {
+                    buf.append(' ');
+                }
+            } else {
+                if (start < 0) {
+                    start = i;
+                }
+            }
+        }
+        if (start >= 0) {
+            convert(s.substring(start, s.length()), buf, enc);
+        }
+        return buf.toString();
+    }
+
+    private static void convert(String s, StringBuilder buf, String enc) throws UnsupportedEncodingException {
+        byte[] bytes = s.getBytes(enc);
+        for (int j = 0; j < bytes.length; j++) {
+            buf.append('%');
+            buf.append(digits.charAt((bytes[j] & 0xf0) >> 4));
+            buf.append(digits.charAt(bytes[j] & 0xf));
+        }
+    }
+    
+    /* end */
 }
--- a/framework/src/com/phonegap/CameraLauncher.java
+++ b/framework/src/com/phonegap/CameraLauncher.java
@@ -26,8 +26,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import android.net.Uri;
-import android.os.Environment;
-import android.provider.MediaStore;
+import android.util.Log;

 /**
 * This class launches the camera view, allows the user to take a picture, closes the camera view,
@@ -43,7 +42,12 @@ public class CameraLauncher extends Plugin {
 	private static final int CAMERA = 1;				// Take picture from camera
 	private static final int SAVEDPHOTOALBUM = 2;		// Choose image from picture library (same as PHOTOLIBRARY for Android)
 	
+	private static final int JPEG = 0;                  // Take a picture of type JPEG
+	private static final int PNG = 1;                   // Take a picture of type PNG
+	
 	private int mQuality;					// Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
+	private int targetWidth;                // desired width of the image
+	private int targetHeight;               // desired height of the image
 	private Uri imageUri;					// Uri of captured image 
 	public String callbackId;
 	
@@ -76,8 +80,18 @@ public class CameraLauncher extends Plugin {
 				if (args.length() > 2) {
 					srcType = args.getInt(2);
 				}
+                if (args.length() > 3) {
+                    this.targetWidth = args.getInt(3); 
+                }
+                if (args.length() > 4) {
+                    this.targetHeight = args.getInt(4); 
+                }
+                int encodingType = JPEG;
+                if (args.length() > 5) {
+                    encodingType = args.getInt(5); 
+                }
 				if (srcType == CAMERA) {
-					this.takePicture(args.getInt(0), destType);
+					this.takePicture(args.getInt(0), destType, encodingType);
 				}
 				else if ((srcType == PHOTOLIBRARY) || (srcType == SAVEDPHOTOALBUM)) {
 					this.getImage(args.getInt(0), srcType, destType);
@@ -111,7 +125,7 @@ public class CameraLauncher extends Plugin {
 	 * @param quality			Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
 	 * @param returnType		Set the type of image to return. 
 	 */
-	public void takePicture(int quality, int returnType) {
+	public void takePicture(int quality, int returnType, int encodingType) {
 		this.mQuality = quality;
 		
 		// Display camera
@@ -119,14 +133,30 @@ public class CameraLauncher extends Plugin {
        
        // Specify file so that large image is captured and returned
        // TODO: What if there isn't any external storage?
-        File photo = new File(Environment.getExternalStorageDirectory(),  "Pic.jpg");
+        File photo = createCaptureFile(encodingType);
        intent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, Uri.fromFile(photo));
        this.imageUri = Uri.fromFile(photo);

        this.ctx.startActivityForResult((Plugin) this, intent, (CAMERA+1)*16 + returnType+1);
 	}
-	
+
 	/**
+	 * Create a file in the applications temporary directory based upon the supplied encoding.
+	 * 
+	 * @param encodingType of the image to be taken
+	 * @return a File object pointing to the temporary picture
+	 */
+    private File createCaptureFile(int encodingType) {
+        File photo = null;
+        if (encodingType == JPEG) {
+            photo = new File(DirectoryManager.getTempDirectoryPath(ctx),  "Pic.jpg");
+        } else {
+            photo = new File(DirectoryManager.getTempDirectoryPath(ctx),  "Pic.png");            
+        }
+        return photo;
+    }
+
+    /**
 	 * Get image from photo library.
 	 * 
 	 * @param quality			Compression quality hint (0-100: 0=low quality & high compression, 100=compress of max quality)
@@ -145,6 +175,50 @@ public class CameraLauncher extends Plugin {
 				new String("Get Picture")), (srcType+1)*16 + returnType + 1);
 	}

+	/**
+	 * Scales the bitmap according to the requested size.
+	 * 
+	 * @param bitmap		The bitmap to scale.
+	 * @return Bitmap		A new Bitmap object of the same bitmap after scaling. 
+	 */
+	public Bitmap scaleBitmap(Bitmap bitmap) {
+        int newWidth = this.targetWidth;
+        int newHeight = this.targetHeight;
+        int origWidth = bitmap.getWidth();
+        int origHeight = bitmap.getHeight();
+
+        // If no new width or height were specified return the original bitmap
+    	if (newWidth <= 0 && newHeight <= 0) {
+    	    return bitmap;
+    	}
+    	// Only the width was specified
+    	else if (newWidth > 0 && newHeight <= 0) {
+            newHeight = (newWidth * origHeight) / origWidth;
+        }
+    	// only the height was specified
+    	else if (newWidth <= 0 && newHeight > 0) {
+            newWidth = (newHeight * origWidth) / origHeight;
+        }
+        // If the user specified both a positive width and height
+        // (potentially different aspect ratio) then the width or height is
+        // scaled so that the image fits while maintaining aspect ratio.
+        // Alternatively, the specified width and height could have been
+        // kept and Bitmap.SCALE_TO_FIT specified when scaling, but this
+        // would result in whitespace in the new image.
+    	else {
+            double newRatio = newWidth / (double)newHeight;
+            double origRatio = origWidth / (double)origHeight;
+
+            if (origRatio > newRatio) {
+                newHeight = (newWidth * origHeight) / origWidth;
+            } else if (origRatio < newRatio) {
+                newWidth = (newHeight * origWidth) / origHeight;
+            }
+        }
+        
+        return Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, true);
+	}
+	
    /**
     * Called when the camera view exits. 
     * 
@@ -161,13 +235,21 @@ public class CameraLauncher extends Plugin {

 		// If CAMERA
 		if (srcType == CAMERA) {
-			
 			// If image available
 			if (resultCode == Activity.RESULT_OK) {
 				try {
 					// Read in bitmap of captured image
-					Bitmap bitmap = android.provider.MediaStore.Images.Media.getBitmap(this.ctx.getContentResolver(), imageUri);
+          Bitmap bitmap;
+          try {
+            bitmap = android.provider.MediaStore.Images.Media.getBitmap(this.ctx.getContentResolver(), imageUri);
+          } catch (FileNotFoundException e) {
+            Uri uri = intent.getData();
+            android.content.ContentResolver resolver = this.ctx.getContentResolver();
+            bitmap = android.graphics.BitmapFactory.decodeStream(resolver.openInputStream(uri));
+          }

+					bitmap = scaleBitmap(bitmap);
+					
 					// If sending base64 image back
 					if (destType == DATA_URL) {
 						this.processPicture(bitmap);
@@ -201,6 +283,9 @@ public class CameraLauncher extends Plugin {
 						// Send Uri back to JavaScript for viewing image
 						this.success(new PluginResult(PluginResult.Status.OK, uri.toString()), this.callbackId);
 					}
+					bitmap.recycle();
+					bitmap = null;
+					System.gc();
 				} catch (IOException e) {
 					e.printStackTrace();
 					this.failPicture("Error capturing image.");
@@ -227,7 +312,11 @@ public class CameraLauncher extends Plugin {
 				if (destType == DATA_URL) {
 					try {
 						Bitmap bitmap =	android.graphics.BitmapFactory.decodeStream(resolver.openInputStream(uri));
+						bitmap = scaleBitmap(bitmap);
 						this.processPicture(bitmap);
+						bitmap.recycle();
+						bitmap = null;
+						System.gc();
 					} catch (FileNotFoundException e) {
 						e.printStackTrace();
 						this.failPicture("Error retrieving image.");
@@ -261,11 +350,15 @@ public class CameraLauncher extends Plugin {
 				byte[] output = Base64.encodeBase64(code);
 				String js_out = new String(output);
 				this.success(new PluginResult(PluginResult.Status.OK, js_out), this.callbackId);
+				js_out = null;
+				output = null;
+				code = null;
 			}	
 		}
 		catch(Exception e) {
 			this.failPicture("Error compressing image.");
 		}		
+		jpeg_data = null;
 	}
 	
 	/**
--- a/framework/src/com/phonegap/Capture.java
+++ b/framework/src/com/phonegap/Capture.java
@@ -0,0 +1,359 @@
+/*
+ * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ * 
+ * Copyright (c) 2005-2010, Nitobi Software Inc.
+ * Copyright (c) 2011, IBM Corporation
+ */
+package com.phonegap;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.app.Activity;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.os.Environment;
+import android.util.Log;
+
+import com.phonegap.api.Plugin;
+import com.phonegap.api.PluginResult;
+
+public class Capture extends Plugin {
+
+	private static final String _DATA = "_data";	// The column name where the file path is stored
+	private static final int CAPTURE_AUDIO = 0;		// Constant for capture audio
+	private static final int CAPTURE_IMAGE = 1;		// Constant for capture image
+	private static final int CAPTURE_VIDEO = 2;		// Constant for capture video
+	private static final String LOG_TAG = "Capture";
+	private String callbackId;						// The ID of the callback to be invoked with our result
+	private long limit;								// the number of pics/vids/clips to take
+	private double duration;						// optional duration parameter for video recording
+	private JSONArray results;						// The array of results to be returned to the user
+	private Uri imageUri;							// Uri of captured image 
+
+	@Override
+	public PluginResult execute(String action, JSONArray args, String callbackId) {
+		this.callbackId = callbackId;
+		this.limit = 1;
+		this.duration = 0.0f;
+		this.results = new JSONArray();
+		
+		JSONObject options = args.optJSONObject(0);
+		if (options != null) {
+			limit = options.optLong("limit", 1);
+			duration = options.optDouble("duration", 0.0f);
+		}
+
+		if (action.equals("getFormatData")) {
+			try {
+				JSONObject obj = getFormatData(args.getString(0), args.getString(1));
+				return new PluginResult(PluginResult.Status.OK, obj);
+			} catch (JSONException e) {
+				return new PluginResult(PluginResult.Status.ERROR);
+			}
+		}
+		else if (action.equals("captureAudio")) {
+			this.captureAudio();
+		}
+		else if (action.equals("captureImage")) {
+			this.captureImage();
+		}
+		else if (action.equals("captureVideo")) {
+			this.captureVideo(duration);	
+		}
+		
+		PluginResult r = new PluginResult(PluginResult.Status.NO_RESULT);
+		r.setKeepCallback(true);
+		return r;
+	}
+
+	/**
+	 * Provides the media data file data depending on it's mime type
+	 * 
+	 * @param filePath path to the file
+	 * @param mimeType of the file
+	 * @return a MediaFileData object
+	 */
+	private JSONObject getFormatData(String filePath, String mimeType) {
+		JSONObject obj = new JSONObject();
+		try {
+			// setup defaults
+			obj.put("height", 0);
+			obj.put("width", 0);
+			obj.put("bitrate", 0);
+			obj.put("duration", 0);
+			obj.put("codecs", "");
+
+			// If the mimeType isn't set the rest will fail
+			// so let's see if we can determine it.
+			if (mimeType == null || mimeType.equals("")) {
+			    mimeType = FileUtils.getMimeType(filePath);
+			}
+			
+			if (mimeType.equals("image/jpeg") || filePath.endsWith(".jpg")) {
+				obj = getImageData(filePath, obj);
+			}
+			else if (filePath.endsWith("audio/3gpp")) {
+				obj = getAudioVideoData(filePath, obj, false);
+			}
+			else if (mimeType.equals("video/3gpp")) {
+				obj = getAudioVideoData(filePath, obj, true);
+			}
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Error: setting media file data object");
+		}
+		return obj;
+	}
+
+	/**
+	 * Get the Image specific attributes
+	 * 
+	 * @param filePath path to the file
+	 * @param obj represents the Media File Data
+	 * @return a JSONObject that represents the Media File Data
+	 * @throws JSONException
+	 */
+	private JSONObject getImageData(String filePath, JSONObject obj) throws JSONException {
+		Bitmap bitmap = BitmapFactory.decodeFile(filePath);
+		obj.put("height", bitmap.getHeight());
+		obj.put("width", bitmap.getWidth());
+		return obj;
+	}
+
+	/**
+	 * Get the Image specific attributes
+	 * 
+	 * @param filePath path to the file
+	 * @param obj represents the Media File Data
+	 * @param video if true get video attributes as well
+	 * @return a JSONObject that represents the Media File Data
+	 * @throws JSONException
+	 */
+	private JSONObject getAudioVideoData(String filePath, JSONObject obj, boolean video) throws JSONException {
+		MediaPlayer player = new MediaPlayer();
+		try {
+			player.setDataSource(filePath);
+			player.prepare();
+			obj.put("duration", player.getDuration());
+			if (video) {
+				obj.put("height", player.getVideoHeight());
+				obj.put("width", player.getVideoWidth());
+			}
+		}
+		catch (IOException e) {
+			Log.d(LOG_TAG, "Error: loading video file");
+		} 
+		return obj;
+	}
+
+	/**
+	 * Sets up an intent to capture audio.  Result handled by onActivityResult()
+	 */
+	private void captureAudio() {
+        Intent intent = new Intent(android.provider.MediaStore.Audio.Media.RECORD_SOUND_ACTION);
+
+        this.ctx.startActivityForResult((Plugin) this, intent, CAPTURE_AUDIO);
+    }
+
+	/**
+	 * Sets up an intent to capture images.  Result handled by onActivityResult()
+	 */
+	private void captureImage() {
+        Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+
+        // Specify file so that large image is captured and returned
+        File photo = new File(DirectoryManager.getTempDirectoryPath(ctx),  "Capture.jpg");
+        intent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, Uri.fromFile(photo));
+        this.imageUri = Uri.fromFile(photo);
+
+        this.ctx.startActivityForResult((Plugin) this, intent, CAPTURE_IMAGE);
+    }
+
+	/**
+	 * Sets up an intent to capture video.  Result handled by onActivityResult()
+	 */
+	private void captureVideo(double duration) {
+        Intent intent = new Intent(android.provider.MediaStore.ACTION_VIDEO_CAPTURE);
+        // Introduced in API 8
+        //intent.putExtra(android.provider.MediaStore.EXTRA_DURATION_LIMIT, duration);
+        
+        this.ctx.startActivityForResult((Plugin) this, intent, CAPTURE_VIDEO);
+    }
+	
+    /**
+     * Called when the video view exits. 
+     * 
+     * @param requestCode		The request code originally supplied to startActivityForResult(), 
+     * 							allowing you to identify who this result came from.
+     * @param resultCode		The integer result code returned by the child activity through its setResult().
+     * @param intent			An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
+     * @throws JSONException 
+     */
+	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
+
+		// Result received okay
+		if (resultCode == Activity.RESULT_OK) {
+			// An audio clip was requested
+			if (requestCode == CAPTURE_AUDIO) {
+				// Get the uri of the audio clip
+				Uri data = intent.getData();
+				// create a file object from the uri
+				results.put(createMediaFile(data));
+
+				if (results.length() >= limit) {
+					// Send Uri back to JavaScript for listening to audio
+					this.success(new PluginResult(PluginResult.Status.OK, results, "navigator.device.capture._castMediaFile"), this.callbackId);
+				} else {
+					// still need to capture more audio clips
+					captureAudio();
+				}
+			} else if (requestCode == CAPTURE_IMAGE) {
+				// For some reason if I try to do:
+				// Uri data = intent.getData();
+				// It crashes in the emulator and on my phone with a null pointer exception
+				// To work around it I had to grab the code from CameraLauncher.java
+				try {
+					// Read in bitmap of captured image
+					Bitmap bitmap = android.provider.MediaStore.Images.Media.getBitmap(this.ctx.getContentResolver(), imageUri);
+
+					// Create entry in media store for image
+					// (Don't use insertImage() because it uses default compression setting of 50 - no way to change it)
+					ContentValues values = new ContentValues();
+					values.put(android.provider.MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
+					Uri uri = null;
+					try {
+						uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
+					} catch (UnsupportedOperationException e) {
+						System.out.println("Can't write to external media storage.");
+						try {
+							uri = this.ctx.getContentResolver().insert(android.provider.MediaStore.Images.Media.INTERNAL_CONTENT_URI, values);
+						} catch (UnsupportedOperationException ex) {
+							System.out.println("Can't write to internal media storage.");							
+							this.fail("Error capturing image - no media storage found.");
+							return;
+						}
+					}
+
+					// Add compressed version of captured image to returned media store Uri
+					OutputStream os  = this.ctx.getContentResolver().openOutputStream(uri);
+					bitmap.compress(Bitmap.CompressFormat.JPEG, 100, os);
+					os.close();
+
+					bitmap.recycle();
+					bitmap = null;
+					System.gc();
+					
+					// Add image to results
+					results.put(createMediaFile(uri));
+					
+					if (results.length() >= limit) {
+						// Send Uri back to JavaScript for viewing image
+						this.success(new PluginResult(PluginResult.Status.OK, results, "navigator.device.capture._castMediaFile"), this.callbackId);
+					} else {
+						// still need to capture more images
+						captureImage();
+					}
+				} catch (IOException e) {
+					e.printStackTrace();
+					this.fail("Error capturing image.");
+				}
+			} else if (requestCode == CAPTURE_VIDEO) {
+				// Get the uri of the video clip
+				Uri data = intent.getData();
+				// create a file object from the uri
+				results.put(createMediaFile(data));
+
+				if (results.length() >= limit) {
+					// Send Uri back to JavaScript for viewing video
+					this.success(new PluginResult(PluginResult.Status.OK, results, "navigator.device.capture._castMediaFile"), this.callbackId);
+				} else {
+					// still need to capture more video clips
+					captureVideo(duration);
+				}
+			}
+		}
+		// If canceled
+		else if (resultCode == Activity.RESULT_CANCELED) {
+			// If we have partial results send them back to the user
+			if (results.length() > 0) {
+				this.success(new PluginResult(PluginResult.Status.OK, results, "navigator.device.capture._castMediaFile"), this.callbackId);				
+			}
+			// user canceled the action
+			else {
+				this.fail("Canceled.");
+			}
+		}
+		// If something else
+		else {
+			// If we have partial results send them back to the user
+			if (results.length() > 0) {
+				this.success(new PluginResult(PluginResult.Status.OK, results, "navigator.device.capture._castMediaFile"), this.callbackId);				
+			}
+			// something bad happened
+			else {
+				this.fail("Did not complete!");
+			}
+		}
+	}
+
+	/**
+	 * Creates a JSONObject that represents a File from the Uri
+	 *  
+	 * @param data the Uri of the audio/image/video
+	 * @return a JSONObject that represents a File
+	 */
+	private JSONObject createMediaFile(Uri data) {
+		File fp = new File(getRealPathFromURI(data));
+		
+		JSONObject obj = new JSONObject();
+
+		try {		
+			// File properties
+			obj.put("name", fp.getName());
+			obj.put("fullPath", fp.getAbsolutePath());
+			obj.put("type", FileUtils.getMimeType(fp.getAbsolutePath()));
+			obj.put("lastModifiedDate", fp.lastModified());
+			obj.put("size", fp.length());
+		} catch (JSONException e) {
+			// this will never happen
+			e.printStackTrace();
+		}
+		
+		return obj;
+	}
+	
+	/**
+	 * Queries the media store to find out what the file path is for the Uri we supply
+	 * 
+	 * @param contentUri the Uri of the audio/image/video
+	 * @return the full path to the file
+	 */
+	private String getRealPathFromURI(Uri contentUri) {
+        String[] proj = { _DATA };
+        Cursor cursor = this.ctx.managedQuery(contentUri, proj, null, null, null);
+        int column_index = cursor.getColumnIndexOrThrow(_DATA);
+        cursor.moveToFirst();
+        return cursor.getString(column_index);
+    }
+
+	/**
+	 * Send error message to JavaScript.
+	 * 
+	 * @param err
+	 */
+	public void fail(String err) {
+		this.error(new PluginResult(PluginResult.Status.ERROR, err), this.callbackId);
+	}
+}
--- a/framework/src/com/phonegap/ContactAccessor.java
+++ b/framework/src/com/phonegap/ContactAccessor.java
@@ -24,7 +24,6 @@

 package com.phonegap;

-import java.lang.reflect.Constructor;
 import java.util.HashMap;

 import android.app.Activity;
@@ -44,53 +43,9 @@ import org.json.JSONObject;
 */
 public abstract class ContactAccessor {
 	
-    /**
-     * Static singleton instance of {@link ContactAccessor} holding the
-     * SDK-specific implementation of the class.
-     */
-    private static ContactAccessor sInstance;
    protected final String LOG_TAG = "ContactsAccessor";
    protected Activity mApp;
    protected WebView mView;
-
-    public static ContactAccessor getInstance(WebView view, Activity app) {
-        if (sInstance == null) {
-            String className;
-
-            /*
-             * Check the version of the SDK we are running on. Choose an
-             * implementation class designed for that version of the SDK.
-             *
-             * Unfortunately we have to use strings to represent the class
-             * names. If we used the conventional ContactAccessorSdk5.class.getName()
-             * syntax, we would get a ClassNotFoundException at runtime on pre-Eclair SDKs.
-             * Using the above syntax would force Dalvik to load the class and try to
-             * resolve references to all other classes it uses. Since the pre-Eclair
-             * does not have those classes, the loading of ContactAccessorSdk5 would fail.
-             */
-            
-            if (android.os.Build.VERSION.RELEASE.startsWith("1.")) {
-                className = "com.phonegap.ContactAccessorSdk3_4";
-            } else {
-                className = "com.phonegap.ContactAccessorSdk5";
-            }
-
-            /*
-             * Find the required class by name and instantiate it.
-             */
-            try {
-                Class<? extends ContactAccessor> clazz =
-                        Class.forName(className).asSubclass(ContactAccessor.class);
-                // Grab constructor for contactsmanager class dynamically.
-                Constructor<? extends ContactAccessor> classConstructor = clazz.getConstructor(Class.forName("android.webkit.WebView"), Class.forName("android.app.Activity"));
-                sInstance = classConstructor.newInstance(view, app);
-            } catch (Exception e) {
-                throw new IllegalStateException(e);
-            }
-        }
-
-        return sInstance;
-    }
 	
    /**
     * Check to see if the data associated with the key is required to 
@@ -114,48 +69,65 @@ public abstract class ContactAccessor {
 		
 		String key;
 		try {
-			for (int i=0; i<fields.length(); i++) {
-				key = fields.getString(i);
-				if (key.startsWith("displayName")) {
-					map.put("displayName", true);
-				}
-				else if (key.startsWith("name")) {
-					map.put("name", true);
-				}
-				else if (key.startsWith("nickname")) {
-					map.put("nickname", true);
-				}
-				else if (key.startsWith("phoneNumbers")) {
-					map.put("phoneNumbers", true);
-				}
-				else if (key.startsWith("emails")) {
-					map.put("emails", true);
-				}
-				else if (key.startsWith("addresses")) {
-					map.put("addresses", true);
-				}
-				else if (key.startsWith("ims")) {
-					map.put("ims", true);
-				}
-				else if (key.startsWith("organizations")) {
-					map.put("organizations", true);
-				}
-				else if (key.startsWith("birthday")) {
-					map.put("birthday", true);
-				}
-				else if (key.startsWith("anniversary")) {
-					map.put("anniversary", true);
-				}
-				else if (key.startsWith("note")) {
-					map.put("note", true);
-				}
-				else if (key.startsWith("relationships")) {
-					map.put("relationships", true);
-				}
-				else if (key.startsWith("urls")) {
-					map.put("urls", true);
-				}
-			}
+		    if (fields.length() == 1 && fields.getString(0).equals("*")) {
+                map.put("displayName", true);
+                map.put("name", true);
+                map.put("nickname", true);
+                map.put("phoneNumbers", true);
+                map.put("emails", true);
+                map.put("addresses", true);
+                map.put("ims", true);
+                map.put("organizations", true);
+                map.put("birthday", true);
+                map.put("note", true);
+                map.put("urls", true);
+                map.put("photos", true);
+                map.put("categories", true);
+		    } 
+		    else {
+    			for (int i=0; i<fields.length(); i++) {
+    				key = fields.getString(i);
+    				if (key.startsWith("displayName")) {
+    					map.put("displayName", true);
+    				}
+    				else if (key.startsWith("name")) {
+    					map.put("name", true);
+    				}
+    				else if (key.startsWith("nickname")) {
+    					map.put("nickname", true);
+    				}
+    				else if (key.startsWith("phoneNumbers")) {
+    					map.put("phoneNumbers", true);
+    				}
+    				else if (key.startsWith("emails")) {
+    					map.put("emails", true);
+    				}
+    				else if (key.startsWith("addresses")) {
+    					map.put("addresses", true);
+    				}
+    				else if (key.startsWith("ims")) {
+    					map.put("ims", true);
+    				}
+    				else if (key.startsWith("organizations")) {
+    					map.put("organizations", true);
+    				}
+    				else if (key.startsWith("birthday")) {
+    					map.put("birthday", true);
+    				}
+    				else if (key.startsWith("note")) {
+    					map.put("note", true);
+    				}
+    				else if (key.startsWith("urls")) {
+    					map.put("urls", true);
+    				}
+                    else if (key.startsWith("photos")) {
+                        map.put("photos", true);
+                    }
+                    else if (key.startsWith("categories")) {
+                        map.put("categories", true);
+                    }
+    			}
+		    }
 		}
 		catch (JSONException e) {
 			Log.e(LOG_TAG, e.getMessage(), e);
@@ -175,11 +147,13 @@ public abstract class ContactAccessor {
 	protected String getJsonString(JSONObject obj, String property) {
 		String value = null;
 		try {
+		    if (obj != null) {
 			value = obj.getString(property);
-			if (value.equals("null")) {
-				Log.d(LOG_TAG, property + " is string called 'null'");
-				value = null;
-			}
+    			if (value.equals("null")) {
+    				Log.d(LOG_TAG, property + " is string called 'null'");
+    				value = null;
+    			}
+		    }
 		}
 		catch (JSONException e) {
 			Log.d(LOG_TAG, "Could not get = " + e.getMessage());
@@ -191,13 +165,19 @@ public abstract class ContactAccessor {
     * Handles adding a JSON Contact object into the database.
     * @return TODO
     */
-	public abstract boolean save(JSONObject contact);
+	public abstract String save(JSONObject contact);

    /**
     * Handles searching through SDK-specific contacts API.
     */
    public abstract JSONArray search(JSONArray filter, JSONObject options);

+    /**
+     * Handles searching through SDK-specific contacts API.
+     * @throws JSONException 
+     */
+    public abstract JSONObject getContactById(String id) throws JSONException;
+
    /**
     * Handles removing a contact from the database.
     */
--- a/framework/src/com/phonegap/ContactAccessorSdk3_4.java
+++ b/framework/src/com/phonegap/ContactAccessorSdk3_4.java
@@ -1,825 +0,0 @@
-// Taken from Android tutorials
-/*
- * PhoneGap is available under *either* the terms of the modified BSD license *or* the
- * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
- * 
- * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
- */
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.phonegap;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.provider.Contacts;
-import android.provider.Contacts.ContactMethods;
-import android.provider.Contacts.ContactMethodsColumns;
-import android.provider.Contacts.Organizations;
-import android.provider.Contacts.People;
-import android.provider.Contacts.Phones;
-import android.util.Log;
-import android.webkit.WebView;
-
-/**
- * An implementation of {@link ContactAccessor} that uses legacy Contacts API.
- * These APIs are deprecated and should not be used unless we are running on a
- * pre-Eclair SDK.
- * <p>
- * There are several reasons why we wouldn't want to use this class on an Eclair device:
- * <ul>
- * <li>It would see at most one account, namely the first Google account created on the device.
- * <li>It would work through a compatibility layer, which would make it inherently less efficient.
- * <li>Not relevant to this particular example, but it would not have access to new kinds
- * of data available through current APIs.
- * </ul>
- */
-@SuppressWarnings("deprecation")
-public class ContactAccessorSdk3_4 extends ContactAccessor {
-	private static final String PEOPLE_ID_EQUALS = "people._id = ?";
-	/**
-	 * A static map that converts the JavaScript property name to Android database column name.
-	 */
-    private static final Map<String, String> dbMap = new HashMap<String, String>();
-    static {
-    	dbMap.put("id", People._ID);
-    	dbMap.put("displayName", People.DISPLAY_NAME);
-    	dbMap.put("phoneNumbers", Phones.NUMBER);
-    	dbMap.put("phoneNumbers.value", Phones.NUMBER);
-    	dbMap.put("emails", ContactMethods.DATA);
-    	dbMap.put("emails.value", ContactMethods.DATA);
-    	dbMap.put("addresses", ContactMethodsColumns.DATA);
-    	dbMap.put("addresses.formatted", ContactMethodsColumns.DATA);
-    	dbMap.put("ims", ContactMethodsColumns.DATA);
-    	dbMap.put("ims.value", ContactMethodsColumns.DATA);
-    	dbMap.put("organizations", Organizations.COMPANY);
-    	dbMap.put("organizations.name", Organizations.COMPANY);
-    	dbMap.put("organizations.title", Organizations.TITLE);
-    	dbMap.put("note", People.NOTES);
-    }
-	
-    /**
-     * Create an contact accessor.
-     */
-	public ContactAccessorSdk3_4(WebView view, Activity app)
-	{
-		mApp = app;
-		mView = view;
-	}
-	
-	@Override
-	/** 
-	 * This method takes the fields required and search options in order to produce an 
-	 * array of contacts that matches the criteria provided.
-	 * @param fields an array of items to be used as search criteria
-	 * @param options that can be applied to contact searching
-	 * @return an array of contacts 
-	 */
-	public JSONArray search(JSONArray fields, JSONObject options) {
-		String searchTerm = "";
-		int limit = 1;
-		boolean multiple = false;
-		try {
-			searchTerm = options.getString("filter");
-			if (searchTerm.length()==0) {
-				searchTerm = "%";
-			}
-			else {
-				searchTerm = "%" + searchTerm + "%";
-			}
-			multiple = options.getBoolean("multiple");
-			if (multiple) {
-				limit = options.getInt("limit");
-			}
-		} catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-		}
-		
-    	ContentResolver cr = mApp.getContentResolver();
-    	
-    	Set<String> contactIds = buildSetOfContactIds(fields, searchTerm);
-		HashMap<String,Boolean> populate = buildPopulationSet(fields);
-
-    	Iterator<String> it = contactIds.iterator();
-    		
-    	JSONArray contacts = new JSONArray();
-    	JSONObject contact;
-    	String contactId;
-    	int pos = 0;
-    	while (it.hasNext() && (pos < limit)) {
-    		contact = new JSONObject();
-	    	try {	    		
-	    		contactId = it.next();
-		    	contact.put("id", contactId);
-		    	
-		    	// Do query for name and note
-		        Cursor cur = cr.query(People.CONTENT_URI, 
-					new String[] {People.DISPLAY_NAME, People.NOTES},
-					PEOPLE_ID_EQUALS,
-					new String[] {contactId},
-					null);
-		        cur.moveToFirst();
-		    	
-				if (isRequired("displayName",populate)) {
-					contact.put("displayName", cur.getString(cur.getColumnIndex(People.DISPLAY_NAME)));		    	
-				}
-				if (isRequired("phoneNumbers",populate)) {
-					contact.put("phoneNumbers", phoneQuery(cr, contactId));
-				}
-				if (isRequired("emails",populate)) {
-					contact.put("emails", emailQuery(cr, contactId));
-				}
-				if (isRequired("addresses",populate)) {
-					contact.put("addresses", addressQuery(cr, contactId));
-				}
-				if (isRequired("organizations",populate)) {
-					contact.put("organizations", organizationQuery(cr, contactId));
-				}
-				if (isRequired("ims",populate)) {
-					contact.put("ims", imQuery(cr, contactId));
-				}
-				if (isRequired("note",populate)) {
-					contact.put("note", cur.getString(cur.getColumnIndex(People.NOTES)));
-				}
-				// nickname
-				// urls
-				// relationship
-				// birthdays
-				// anniversary
-		    	
-		    	pos++;
-				cur.close();
-	    	} catch (JSONException e) {
-	    		Log.e(LOG_TAG, e.getMessage(), e);
-	    	}
-	    	contacts.put(contact);
-        }
-    	return contacts;
-	}
-	
-	/**
-	 * Query the database using the search term to build up a list of contact ID's 
-	 * matching the search term
-	 * @param fields
-	 * @param searchTerm
-	 * @return a set of contact ID's
-	 */
-	private Set<String> buildSetOfContactIds(JSONArray fields, String searchTerm) {
-		Set<String> contactIds = new HashSet<String>();	
-		
-		String key;
-		try {
-			for (int i=0; i<fields.length(); i++) {
-				key = fields.getString(i);
-				if (key.startsWith("displayName")) {
-					doQuery(searchTerm, contactIds,
-							People.CONTENT_URI,
-							People._ID,
-							dbMap.get(key) + " LIKE ?",
-							new String[] {searchTerm});
-				}
-//				else if (key.startsWith("name")) {
-//					Log.d(LOG_TAG, "Doing " + key + " query");
-//					doQuery(searchTerm, contactIds,
-//							ContactsContract.Data.CONTENT_URI,
-//							ContactsContract.Data.CONTACT_ID,
-//							dbMap.get(key) + " LIKE ? AND " + ContactsContract.Data.MIMETYPE + " = ?",
-//							new String[] {searchTerm, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE});
-//				}
-				else if (key.startsWith("phoneNumbers")) {
-					doQuery(searchTerm, contactIds,
-							Phones.CONTENT_URI,
-							Phones.PERSON_ID,
-							dbMap.get(key) + " LIKE ?",
-							new String[] {searchTerm});
-				}
-				else if (key.startsWith("emails")) {
-					doQuery(searchTerm, contactIds,
-							ContactMethods.CONTENT_EMAIL_URI,
-							ContactMethods.PERSON_ID,
-							dbMap.get(key) + " LIKE ? AND " + ContactMethods.KIND + " = ?", 
-							new String[] {searchTerm, ContactMethods.CONTENT_EMAIL_ITEM_TYPE});
-				}
-				else if (key.startsWith("addresses")) {
-					doQuery(searchTerm, contactIds,
-							ContactMethods.CONTENT_URI,
-							ContactMethods.PERSON_ID,
-							dbMap.get(key) + " LIKE ? AND " + ContactMethods.KIND + " = ?",
-							new String[] {searchTerm, ContactMethods.CONTENT_POSTAL_ITEM_TYPE});					
-				}
-				else if (key.startsWith("ims")) {
-					doQuery(searchTerm, contactIds,
-							ContactMethods.CONTENT_URI,
-							ContactMethods.PERSON_ID,
-							dbMap.get(key) + " LIKE ? AND " + ContactMethods.KIND + " = ?",
-							new String[] {searchTerm, ContactMethods.CONTENT_IM_ITEM_TYPE});					
-				}
-				else if (key.startsWith("organizations")) {
-					doQuery(searchTerm, contactIds,
-							Organizations.CONTENT_URI,
-							ContactMethods.PERSON_ID,
-							dbMap.get(key) + " LIKE ?",
-							new String[] {searchTerm});					
-				}
-				else if (key.startsWith("note")) {
-					doQuery(searchTerm, contactIds,
-							People.CONTENT_URI,
-							People._ID,
-							dbMap.get(key) + " LIKE ?",
-							new String[] {searchTerm});					
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-		}
-		
-		return contactIds;
-	}
-
-	/**
-	 * A convenience method so we don't duplicate code in doQuery
-	 * @param searchTerm
-	 * @param contactIds
-	 * @param uri
-	 * @param projection
-	 * @param selection
-	 * @param selectionArgs
-	 */
-	private void doQuery(String searchTerm, Set<String> contactIds, 
-			Uri uri, String projection, String selection, String[] selectionArgs) {
-		ContentResolver cr = mApp.getContentResolver();
-
-		Cursor cursor = cr.query(
-				uri, 
-				null,
-				selection,
-				selectionArgs,
-				null);
-		
-		while (cursor.moveToNext()) {
-			contactIds.add(cursor.getString(cursor.getColumnIndex(projection)));
-		}
-		cursor.close();
-	}
-	
-	/**
-	 * Create a ContactField JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactFields
-	 */
-	private JSONArray imQuery(ContentResolver cr, String contactId) {
-		String imWhere = ContactMethods.PERSON_ID 
-        	+ " = ? AND " + ContactMethods.KIND + " = ?"; 
-		String[] imWhereParams = new String[]{contactId, ContactMethods.CONTENT_IM_ITEM_TYPE}; 
-		Cursor cursor = cr.query(ContactMethods.CONTENT_URI, 
-		         null, imWhere, imWhereParams, null); 
-		JSONArray ims = new JSONArray();
-		JSONObject im;
-		while (cursor.moveToNext()) {
-			im = new JSONObject();
-			try{
-			im.put("id", cursor.getString(
-					cursor.getColumnIndex(ContactMethods._ID)));
-			im.put("primary", false);
-			im.put("value", cursor.getString(
-					cursor.getColumnIndex(ContactMethodsColumns.DATA)));
-			im.put("type", getContactType(cursor.getInt(
-					cursor.getColumnIndex(ContactMethodsColumns.TYPE))));
-			ims.put(im);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		cursor.close();
-		return null;
-	}
-
-	/**
-	 * Create a ContactOrganization JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactOrganization
-	 */
-	private JSONArray organizationQuery(ContentResolver cr, String contactId) {
-		String orgWhere = ContactMethods.PERSON_ID + " = ?"; 
-		String[] orgWhereParams = new String[]{contactId}; 
-		Cursor cursor = cr.query(Organizations.CONTENT_URI, 
-	              null, orgWhere, orgWhereParams, null);
-		JSONArray organizations = new JSONArray();
-		JSONObject organization;
-		while (cursor.moveToNext()) {
-			organization = new JSONObject();
-			try{
-				organization.put("id", cursor.getString(cursor.getColumnIndex(Organizations._ID)));
-				organization.put("name", cursor.getString(cursor.getColumnIndex(Organizations.COMPANY)));
-				organization.put("title", cursor.getString(cursor.getColumnIndex(Organizations.TITLE)));
-				// organization.put("department", cursor.getString(cursor.getColumnIndex(Organizations)));
-				// organization.put("description", cursor.getString(cursor.getColumnIndex(Organizations)));
-				// organization.put("endDate", cursor.getString(cursor.getColumnIndex(Organizations)));
-				// organization.put("location", cursor.getString(cursor.getColumnIndex(Organizations)));
-				// organization.put("startDate", cursor.getString(cursor.getColumnIndex(Organizations)));
-				organizations.put(organization);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		return organizations;
-	}
-	
-	/**
-	 * Create a ContactAddress JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactAddress
-	 */
-	private JSONArray addressQuery(ContentResolver cr, String contactId) {
-		String addrWhere = ContactMethods.PERSON_ID 
-			+ " = ? AND " + ContactMethods.KIND + " = ?"; 
-		String[] addrWhereParams = new String[]{contactId, 
-		ContactMethods.CONTENT_POSTAL_ITEM_TYPE}; 		
-		Cursor cursor = cr.query(ContactMethods.CONTENT_URI, 
-				null, addrWhere, addrWhereParams, null); 
-		JSONArray addresses = new JSONArray();
-		JSONObject address;
-		while (cursor.moveToNext()) {
-			address = new JSONObject();
-			try{
-				address.put("id", cursor.getString(cursor.getColumnIndex(ContactMethods._ID)));
-				address.put("formatted", cursor.getString(cursor.getColumnIndex(ContactMethodsColumns.DATA)));
-				addresses.put(address);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		return addresses;
-	}
-	
-	/**
-	 * Create a ContactField JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactFields
-	 */
-	private JSONArray phoneQuery(ContentResolver cr, String contactId) {
-		Cursor cursor = cr.query(
-				Phones.CONTENT_URI, 
-				null, 
-				Phones.PERSON_ID +" = ?", 
-				new String[]{contactId}, null);
-		JSONArray phones = new JSONArray();
-		JSONObject phone;
-		while (cursor.moveToNext()) {
-			phone = new JSONObject();
-			try{
-				phone.put("id", cursor.getString(cursor.getColumnIndex(Phones._ID)));
-				phone.put("primary", false);
-				phone.put("value", cursor.getString(cursor.getColumnIndex(Phones.NUMBER)));
-				phone.put("type", getPhoneType(cursor.getInt(cursor.getColumnIndex(Phones.TYPE))));
-				phones.put(phone);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		return phones;
-	}
-	
-	/**
-	 * Create a ContactField JSONArray
-	 * @param cr database access object
-	 * @param contactId the ID to search the database for
-	 * @return a JSONArray representing a set of ContactFields
-	 */
-	private JSONArray emailQuery(ContentResolver cr, String contactId) {
-		Cursor cursor = cr.query(
-				ContactMethods.CONTENT_EMAIL_URI, 
-				null, 
-				ContactMethods.PERSON_ID +" = ?", 
-				new String[]{contactId}, null);
-		JSONArray emails = new JSONArray();
-		JSONObject email;
-		while (cursor.moveToNext()) {
-			email = new JSONObject();
-			try{
-				email.put("id", cursor.getString(cursor.getColumnIndex(ContactMethods._ID)));
-				email.put("primary", false);
-				email.put("value", cursor.getString(cursor.getColumnIndex(ContactMethods.DATA)));
-				// TODO Find out why adding an email type throws and exception
-				//email.put("type", cursor.getString(cursor.getColumnIndex(ContactMethods.TYPE)));
-				emails.put(email);
-			} catch (JSONException e) {
-				Log.e(LOG_TAG, e.getMessage(), e);
-			}
-		} 
-		return emails;
-	}
-
-	/**
-	 * This method will save a contact object into the devices contacts database.
-	 * 
-	 * @param contact the contact to be saved.
-	 * @returns true if the contact is successfully saved, false otherwise.
-	 */
-	@Override
-	public boolean save(JSONObject contact) {
-		ContentValues personValues = new ContentValues();
-
-		String id = getJsonString(contact, "id");
-			
-		String name = getJsonString(contact, "displayName");
-		if (name != null) {
-			personValues.put(Contacts.People.NAME, name);				
-		}
-		String note = getJsonString(contact, "note");
-		if (note != null) {
-			personValues.put(Contacts.People.NOTES, note);
-		}
-
-		/* STARRED 0 = Contacts, 1 = Favorites */
-		personValues.put(Contacts.People.STARRED, 0);
-		
-		Uri newPersonUri;
-		// Add new contact
-		if (id == null) {
-			newPersonUri = Contacts.People.createPersonInMyContactsGroup(mApp.getContentResolver(), personValues);
-		}
-		// modify existing contact
-		else {
-			newPersonUri = Uri.withAppendedPath(Contacts.People.CONTENT_URI, id);
-			mApp.getContentResolver().update(newPersonUri, personValues, PEOPLE_ID_EQUALS,  new String[]{id});
-		}
-		
-		if (newPersonUri != null) {
-			// phoneNumbers
-			savePhoneNumbers(contact, newPersonUri);
-			// emails
-			saveEntries(contact, newPersonUri, "emails", Contacts.KIND_EMAIL);
-			// addresses
-			saveAddresses(contact, newPersonUri);
-			// organizations
-			saveOrganizations(contact, newPersonUri);
-			// ims
-			saveEntries(contact, newPersonUri, "ims", Contacts.KIND_IM);
-			
-			// Successfully create a Contact
-			return true;
-		}
-		return false;
-	}
-	
-	/** 
-	 * Takes a JSON contact object and loops through the available organizations.  If the  
-	 * organization has an id that is not equal to null the organization will be updated in the database.
-	 * If the id is null then we treat it as a new organization.
-	 * 
-	 * @param contact the contact to extract the organizations from
-	 * @param uri the base URI for this contact.
-	 */
-	private void saveOrganizations(JSONObject contact, Uri newPersonUri) {
-		ContentValues values = new ContentValues();
-		Uri orgUri = Uri.withAppendedPath(newPersonUri,
-				Contacts.Organizations.CONTENT_DIRECTORY);
-		String id = null;
-		try {
-			JSONArray orgs = contact.getJSONArray("organizations");
-			if (orgs != null && orgs.length() > 0) {
-				JSONObject org;
-				for (int i=0; i<orgs.length(); i++) {
-					org = orgs.getJSONObject(i);
-					id = getJsonString(org, "id");					
-					values.put(Contacts.Organizations.COMPANY, getJsonString(org, "name"));
-					values.put(Contacts.Organizations.TITLE, getJsonString(org, "title"));
-					if (id == null) {
-						Uri contactUpdate = mApp.getContentResolver().insert(orgUri, values);
-					}
-					else {
-						Uri tempUri = Uri.withAppendedPath(orgUri, id);					
-						mApp.getContentResolver().update(tempUri, values, null, null);
-					}
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not save organizations = " + e.getMessage());
-		}
-	}
-
-	/** 
-	 * Takes a JSON contact object and loops through the available addresses.  If the  
-	 * address has an id that is not equal to null the address will be updated in the database.
-	 * If the id is null then we treat it as a new address.
-	 * 
-	 * @param contact the contact to extract the addresses from
-	 * @param uri the base URI for this contact.
-	 */
-	private void saveAddresses(JSONObject contact, Uri uri) {
-		ContentValues values = new ContentValues();
-		Uri newUri = Uri.withAppendedPath(uri,
-				Contacts.People.ContactMethods.CONTENT_DIRECTORY);
-		String id = null;
-		try {
-			JSONArray entries = contact.getJSONArray("addresses");
-			if (entries != null && entries.length() > 0) {
-				JSONObject entry;
-				values.put(Contacts.ContactMethods.KIND, Contacts.KIND_POSTAL);
-				for (int i=0; i<entries.length(); i++) {
-					entry = entries.getJSONObject(i);
-					id = getJsonString(entry, "id");
-					
-					String address = getJsonString(entry, "formatted");
-					if (address != null) {
-						values.put(Contacts.ContactMethods.DATA, address);
-					}
-					else {
-						values.put(Contacts.ContactMethods.DATA, createAddressString(entry));
-					}
-					
-					if (id == null) {
-						Uri contactUpdate = mApp.getContentResolver().insert(newUri, values);
-					}
-					else {
-						Uri tempUri = Uri.withAppendedPath(newUri, id);
-						mApp.getContentResolver().update(tempUri, values, null, null);
-					}
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not save address = " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Takes a ContactAddress JSON object and creates a fully 
-	 * formatted address string.
-	 * 
-	 * @param entry the full address object
-	 * @return a formatted address string
-	 */
-	private String createAddressString(JSONObject entry) {
-		StringBuffer buffer = new StringBuffer("");
-		if (getJsonString(entry, "locality") != null ) {
-			buffer.append(getJsonString(entry, "locality"));
-		}
-		if (getJsonString(entry, "region") != null ) {
-			if (buffer.length() > 0 ) {
-				buffer.append(", ");
-			}
-			buffer.append(getJsonString(entry, "region"));
-		}
-		if (getJsonString(entry, "postalCode") != null ) {
-			if (buffer.length() > 0 ) {
-				buffer.append(", ");
-			}
-			buffer.append(getJsonString(entry, "postalCode"));
-		}
-		if (getJsonString(entry, "country") != null ) {
-			if (buffer.length() > 0 ) {
-				buffer.append(", ");
-			}
-			buffer.append(getJsonString(entry, "country"));
-		}
-		return buffer.toString();
-	}
-
-	/** 
-	 * Takes a JSON contact object and loops through the available entries (Emails/IM's).  If the  
-	 * entry has an id that is not equal to null the entry will be updated in the database.
-	 * If the id is null then we treat it as a new entry.
-	 * 
-	 * @param contact the contact to extract the entries from
-	 * @param uri the base URI for this contact.
-	 */
-	private void saveEntries(JSONObject contact, Uri uri, String dataType, int contactKind) {
-		ContentValues values = new ContentValues();
-		Uri newUri = Uri.withAppendedPath(uri,
-				Contacts.People.ContactMethods.CONTENT_DIRECTORY);
-		String id = null;
-
-		try {
-			JSONArray entries = contact.getJSONArray(dataType);
-			if (entries != null && entries.length() > 0) {
-				JSONObject entry;
-				values.put(Contacts.ContactMethods.KIND, contactKind);
-				for (int i=0; i<entries.length(); i++) {
-					entry = entries.getJSONObject(i);
-					id = getJsonString(entry, "id");
-					values.put(Contacts.ContactMethods.DATA, getJsonString(entry, "value"));
-					values.put(Contacts.ContactMethods.TYPE, getContactType(getJsonString(entry, "type")));
-					if (id==null) {
-						Uri contactUpdate = mApp.getContentResolver().insert(newUri, values);
-					}
-					else {
-						Uri tempUri = Uri.withAppendedPath(newUri, id);
-						mApp.getContentResolver().update(tempUri, values, null, null);
-					}
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not save " + dataType + " = " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Converts a string from the W3C Contact API to it's Android int value.
-	 * @param string
-	 * @return Android int value
-	 */
-	private int getContactType(String string) {
-		int type = Contacts.ContactMethods.TYPE_OTHER;
-		if (string!=null) {
-			if ("home".equals(string.toLowerCase())) {
-				return Contacts.ContactMethods.TYPE_HOME;
-			}
-			else if ("work".equals(string.toLowerCase())) {
-				return Contacts.ContactMethods.TYPE_WORK;
-			}
-			else if ("other".equals(string.toLowerCase())) {
-				return Contacts.ContactMethods.TYPE_OTHER;
-			}
-			else if ("custom".equals(string.toLowerCase())) {
-				return Contacts.ContactMethods.TYPE_CUSTOM;
-			}		
-		}
-		return type;
-	}
-
-	/**
-	 * getPhoneType converts an Android phone type into a string
-	 * @param type 
-	 * @return phone type as string.
-	 */
-	private String getContactType(int type) {
-		String stringType;
-		switch (type) {
-			case Contacts.ContactMethods.TYPE_CUSTOM: 
-				stringType = "custom";
-				break;
-			case Contacts.ContactMethods.TYPE_HOME: 
-				stringType = "home";
-				break;
-			case Contacts.ContactMethods.TYPE_WORK: 
-				stringType = "work";
-				break;
-			case Contacts.ContactMethods.TYPE_OTHER: 
-			default: 
-				stringType = "other";
-				break;
-		}
-		return stringType;
-	}
-
-	/** 
-	 * Takes a JSON contact object and loops through the available phone numbers.  If the phone 
-	 * number has an id that is not equal to null the phone number will be updated in the database.
-	 * If the id is null then we treat it as a new phone number.
-	 * 
-	 * @param contact the contact to extract the phone numbers from
-	 * @param uri the base URI for this contact.
-	 */
-	private void savePhoneNumbers(JSONObject contact, Uri uri) {
-		ContentValues values = new ContentValues();
-		Uri phonesUri = Uri.withAppendedPath(uri,
-				Contacts.People.Phones.CONTENT_DIRECTORY);	
-		String id = null;
-
-		try {
-			JSONArray phones = contact.getJSONArray("phoneNumbers");
-			if (phones != null && phones.length() > 0) {
-				JSONObject phone;
-				for (int i=0; i<phones.length(); i++) {
-					phone = phones.getJSONObject(i);
-					id = getJsonString(phone, "id");
-					values.put(Contacts.Phones.NUMBER, getJsonString(phone, "value"));
-					values.put(Contacts.Phones.TYPE, getPhoneType(getJsonString(phone, "type")));
-					if (id==null) {
-						Uri phoneUpdate = mApp.getContentResolver().insert(phonesUri, values);
-					}
-					else {
-						Uri newUri = Uri.withAppendedPath(phonesUri, id);
-						mApp.getContentResolver().update(newUri, values, null, null);
-					}
-				}
-			}
-		}
-		catch (JSONException e) {
-			Log.d(LOG_TAG, "Could not save phones = " + e.getMessage());
-		}
-	}
-
-	/**
-	 * Converts a string from the W3C Contact API to it's Android int value.
-	 * @param string
-	 * @return Android int value
-	 */
-	private int getPhoneType(String string) {
-		int type = Contacts.Phones.TYPE_OTHER;
-		if ("home".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_HOME;
-		}
-		else if ("mobile".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_MOBILE;
-		}
-		else if ("work".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_WORK;
-		}
-		else if ("work fax".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_FAX_WORK;
-		}
-		else if ("home fax".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_FAX_HOME;
-		}
-		else if ("fax".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_FAX_WORK;
-		}
-		else if ("pager".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_PAGER;
-		}
-		else if ("other".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_OTHER;
-		}
-		else if ("custom".equals(string.toLowerCase())) {
-			return Contacts.Phones.TYPE_CUSTOM;
-		}
-		return type;
-	}
-
-	/**
-	 * getPhoneType converts an Android phone type into a string
-	 * @param type 
-	 * @return phone type as string.
-	 */
-	private String getPhoneType(int type) {
-		String stringType;
-		switch (type) {
-		case Contacts.Phones.TYPE_CUSTOM:
-			stringType = "custom";
-			break;
-		case Contacts.Phones.TYPE_FAX_HOME:
-			stringType = "home fax";
-			break;
-		case Contacts.Phones.TYPE_FAX_WORK:
-			stringType = "work fax";
-			break;
-		case Contacts.Phones.TYPE_HOME:
-			stringType = "home";
-			break;
-		case Contacts.Phones.TYPE_MOBILE:
-			stringType = "mobile";
-			break;
-		case Contacts.Phones.TYPE_PAGER:
-			stringType = "pager";
-			break;
-		case Contacts.Phones.TYPE_WORK:
-			stringType = "work";
-			break;
-		case Contacts.Phones.TYPE_OTHER:
-		default: 
-			stringType = "custom";
-			break;
-		}
-		return stringType;
-	}
-
-	@Override
-	/** 
-	 * This method will remove a Contact from the database based on ID.
-	 * @param id the unique ID of the contact to remove
-	 */
-	public boolean remove(String id) {
-    	int result = mApp.getContentResolver().delete(People.CONTENT_URI, 
-    			PEOPLE_ID_EQUALS, 
-    			new String[] {id});
-    	
-    	return (result > 0) ? true : false;
-	}
-}
--- a/framework/src/com/phonegap/ContactAccessorSdk5.java
+++ b/framework/src/com/phonegap/ContactAccessorSdk5.java
--- a/framework/src/com/phonegap/ContactManager.java
+++ b/framework/src/com/phonegap/ContactManager.java
@@ -16,9 +16,18 @@ import android.util.Log;

 public class ContactManager extends Plugin {
 	
-    private static ContactAccessor contactAccessor;
+    private ContactAccessor contactAccessor;
 	private static final String LOG_TAG = "Contact Query";

+	public static final int UNKNOWN_ERROR = 0;
+	public static final int INVALID_ARGUMENT_ERROR = 1;
+	public static final int TIMEOUT_ERROR = 2;
+	public static final int PENDING_OPERATION_ERROR = 3;
+	public static final int IO_ERROR = 4;
+	public static final int NOT_SUPPORTED_ERROR = 5;
+	public static final int PERMISSION_DENIED_ERROR = 20;
+
+	
 	/**
 	 * Constructor.
 	 */
@@ -34,31 +43,57 @@ public class ContactManager extends Plugin {
 	 * @return 				A PluginResult object with a status and message.
 	 */
 	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		if (contactAccessor == null) {
-			contactAccessor = ContactAccessor.getInstance(webView, ctx);
-		}
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
+        PluginResult.Status status = PluginResult.Status.OK;
+        String result = "";     
+
+        /**
+         * Check to see if we are on an Android 1.X device.  If we are return an error as we 
+         * do not support this as of PhoneGap 1.0.
+         */
+        if (android.os.Build.VERSION.RELEASE.startsWith("1.")) {
+            JSONObject res = null;
+            try {
+                res = new JSONObject();
+                res.put("code", NOT_SUPPORTED_ERROR);
+                res.put("message", "Contacts are not supported in Android 1.X devices");
+            } catch (JSONException e) {
+                // This should never happen
+                Log.e(LOG_TAG, e.getMessage(), e);
+            }
+            return new PluginResult(PluginResult.Status.ERROR, res);
+        }
+
+        /**
+         * Only create the contactAccessor after we check the Android version or the program will crash
+         * older phones.
+         */
+        if (this.contactAccessor == null) {
+            this.contactAccessor = new ContactAccessorSdk5(this.webView, this.ctx);
+        }
+        
 		try {
 			if (action.equals("search")) {
-				JSONArray res = contactAccessor.search(args.getJSONArray(0), args.getJSONObject(1));
-				return new PluginResult(status, res, "navigator.service.contacts.cast");
+				JSONArray res = contactAccessor.search(args.getJSONArray(0), args.optJSONObject(1));
+				return new PluginResult(status, res, "navigator.contacts.cast");
 			}
 			else if (action.equals("save")) {
-				return new PluginResult(status, contactAccessor.save(args.getJSONObject(0)));
+			    String id = contactAccessor.save(args.getJSONObject(0));
+				if (id != null) {
+	                JSONObject res = contactAccessor.getContactById(id);
+	                if (res != null) {
+	                    return new PluginResult(status, res);
+	                }
+				}
 			}
 			else if (action.equals("remove")) {
 				if (contactAccessor.remove(args.getString(0))) {
 					return new PluginResult(status, result);					
 				}
-				else {
-					JSONObject r = new JSONObject();
-					r.put("code", 2);
-					return new PluginResult(PluginResult.Status.ERROR, r);
-				}
 			}
-			return new PluginResult(status, result);
+			// If we get to this point an error has occurred
+            JSONObject r = new JSONObject();
+            r.put("code", UNKNOWN_ERROR);
+            return new PluginResult(PluginResult.Status.ERROR, r);
 		} catch (JSONException e) {
 			Log.e(LOG_TAG, e.getMessage(), e);
 			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
--- a/framework/src/com/phonegap/Device.java
+++ b/framework/src/com/phonegap/Device.java
@@ -14,13 +14,11 @@ import org.json.JSONObject;
 import com.phonegap.api.PhonegapActivity;
 import com.phonegap.api.Plugin;
 import com.phonegap.api.PluginResult;
-import android.content.Context;
 import android.provider.Settings;
-import android.telephony.TelephonyManager;

 public class Device extends Plugin {
 	
-	public static String phonegapVersion = "0.9.3";				// PhoneGap version
+    public static String phonegapVersion = "1.0.0rc3";               // PhoneGap version
 	public static String platform = "Android";					// Device OS
 	public static String uuid;									// Device UUID
    
@@ -116,34 +114,13 @@ public class Device extends Plugin {
 	public String getPhonegapVersion() {
 		return Device.phonegapVersion;
 	}	
-
-	public String getLine1Number(){
-	  TelephonyManager operator = (TelephonyManager)this.ctx.getSystemService(Context.TELEPHONY_SERVICE);
-	  return operator.getLine1Number();
-	}
 	
-	public String getDeviceId(){
-	  TelephonyManager operator = (TelephonyManager)this.ctx.getSystemService(Context.TELEPHONY_SERVICE);
-	  return operator.getDeviceId();
-	}
-	
-	public String getSimSerialNumber(){
-	  TelephonyManager operator = (TelephonyManager)this.ctx.getSystemService(Context.TELEPHONY_SERVICE);
-	  return operator.getSimSerialNumber();
-  }
-  
-	public String getSubscriberId(){
-	  TelephonyManager operator = (TelephonyManager)this.ctx.getSystemService(Context.TELEPHONY_SERVICE);
-	  return operator.getSubscriberId();
-	}
-	
-	public String getModel()
-	{
+	public String getModel() {
 		String model = android.os.Build.MODEL;
 		return model;
 	}
-	public String getProductName()
-	{
+	
+	public String getProductName() {
 		String productname = android.os.Build.PRODUCT;
 		return productname;
 	}
@@ -158,8 +135,7 @@ public class Device extends Plugin {
 		return osversion;
 	}
 	
-	public String getSDKVersion()
-	{
+	public String getSDKVersion() {
 		String sdkversion = android.os.Build.VERSION.SDK;
 		return sdkversion;
 	}
--- a/framework/src/com/phonegap/DirectoryManager.java
+++ b/framework/src/com/phonegap/DirectoryManager.java
@@ -8,15 +8,10 @@
 package com.phonegap;

 import java.io.File;
-import java.util.Date;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;

+import android.content.Context;
 import android.os.Environment;
 import android.os.StatFs;
-import android.util.Log;

 /**
 * This class provides file directory utilities.  
@@ -78,29 +73,6 @@ public class DirectoryManager {
 		return (freeSpace);
 	}	
 	
-	/**
-	 * Create directory on SD card.
-	 * 
-	 * @param directoryName		The name of the directory to create.
-	 * @return 					T=successful, F=failed
-	 */
-	protected static boolean createDirectory(String directoryName) {
-		boolean status;
-		
-		// Make sure SD card exists
-		if ((testSaveLocationExists()) && (!directoryName.equals(""))) {
-			File path = Environment.getExternalStorageDirectory();
-            File newPath = constructFilePaths(path.toString(), directoryName);
-			status = newPath.mkdir();
-			status = true;
-		}
-		
-		// If no SD card or invalid dir name
-		else {
-			status = false;
-		}
-		return status;
-	}
 	
 	/**
 	 * Determine if SD card exists.
@@ -123,95 +95,6 @@ public class DirectoryManager {
 		return status;
 	}
 	
-	/**
-	 * Delete directory.
-	 * 
-	 * @param fileName		The name of the directory to delete
-	 * @return				T=deleted, F=could not delete
-	 */
-	protected static boolean deleteDirectory(String fileName) {
-		boolean status;
-		SecurityManager checker = new SecurityManager();
-			
-		// Make sure SD card exists
-		if ((testSaveLocationExists()) && (!fileName.equals(""))) {	
-			File path = Environment.getExternalStorageDirectory();
-            File newPath = constructFilePaths(path.toString(), fileName);
-			checker.checkDelete(newPath.toString());
-			
-			// If dir to delete is really a directory
-			if (newPath.isDirectory()) {
-				String[] listfile = newPath.list();
-				
-				// Delete all files within the specified directory and then delete the directory
-				try{
-					for (int i=0; i < listfile.length; i++){
-						File deletedFile = new File (newPath.toString()+"/"+listfile[i].toString());
-						deletedFile.delete();
-					}
-					newPath.delete();
-					Log.i("DirectoryManager deleteDirectory", fileName);
-					status = true;
-				}
-				catch (Exception e){
-					e.printStackTrace();
-					status = false;
-				}
-			}
-			
-			// If dir not a directory, then error
-			else {
-				status = false;
-			}
-		}
-		
-		// If no SD card 
-		else {
-			status = false;
-		}
-		return status;
-	}
-	
-	/**
-	 * Delete file.
-	 * 
-	 * @param fileName				The name of the file to delete
-	 * @return						T=deleted, F=not deleted
-	 */
-	protected static boolean deleteFile(String fileName) {
-		boolean status;
-		SecurityManager checker = new SecurityManager();
-			
-		// Make sure SD card exists
-		if ((testSaveLocationExists()) && (!fileName.equals(""))) {
-			File path = Environment.getExternalStorageDirectory();
-            File newPath = constructFilePaths(path.toString(), fileName);
-			checker.checkDelete(newPath.toString());
-			
-			// If file to delete is really a file
-			if (newPath.isFile()){
-				try {
-					Log.i("DirectoryManager deleteFile", fileName);
-					newPath.delete();
-					status = true;
-				}catch (SecurityException se){
-					se.printStackTrace();
-					status = false;
-				}
-			}
-			// If not a file, then error
-			else {
-				status = false;
-			}
-		}
-		
-		// If no SD card
-		else {
-			status = false;
-		}
-		return status;
-	}
-	
 	/**
 	 * Create a new file object from two file paths.
 	 * 
@@ -229,45 +112,31 @@ public class DirectoryManager {
 		}
 		return newPath;
 	}
+    
+    /**
+     * Determine if we can use the SD Card to store the temporary file.  If not then use 
+     * the internal cache directory.
+     * 
+     * @return the absolute path of where to store the file
+     */
+    protected static String getTempDirectoryPath(Context ctx) {
+        File cache = null;
+        
+        // SD Card Mounted
+        if (Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
+            cache = new File(Environment.getExternalStorageDirectory().getAbsolutePath() + 
+                    "/Android/data/" + ctx.getPackageName() + "/cache/");
+        } 
+        // Use internal storage
+        else {
+            cache = ctx.getCacheDir();
+        }

-	/**
-	 * This method will determine the file properties of the file specified
-	 * by the filePath.  Creates a JSONObject with name, lastModifiedDate and 
-	 * size properties.
-	 * 
-	 * @param filePath the file to get the properties of
-	 * @return a JSONObject with the files properties
-	 */
-	protected static JSONObject getFile(String filePath) {
-		File fp = new File(filePath);
-		
-		JSONObject obj = new JSONObject();
-		try {
-			obj.put("name", fp.getAbsolutePath());
-			obj.put("lastModifiedDate", new Date(fp.lastModified()).toString());
-			obj.put("size", fp.length());
-		}
-		catch (JSONException e) {
-			Log.e(LOG_TAG, e.getMessage(), e);
-		}
-		
-		return obj;
-	}
-
-	/**
-	 * This method returns a JSONArray of file paths.  Android's default 
-	 * location where files can be written is Environment.getExternalStorageDirectory().
-	 * We are returning a array with one element so the interface can remain 
-	 * consistent with BlackBerry as they have two areas where files can be 
-	 * written.
-	 * 
-	 * @return an array of file paths
-	 */
-	protected static JSONArray getRootPaths() {
-        JSONArray retVal = new JSONArray();
-        String path = Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
-        retVal.put(path);
-		return retVal;
-	}
+        // Create the cache directory if it doesn't exist
+        if (!cache.exists()) {
+            cache.mkdirs();
+        }

+        return cache.getAbsolutePath();
+    }
 }
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -3,37 +3,55 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 * 
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */
 package com.phonegap;

+import java.util.HashMap;
+import java.util.Map.Entry;
+
 import org.json.JSONArray;
+import org.json.JSONException;
+
+import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
-import android.graphics.Bitmap;
 import android.graphics.Color;
+import android.graphics.Rect;
+import android.media.AudioManager;
 import android.net.Uri;
+import android.net.http.SslError;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.Display;
 import android.view.KeyEvent;
+import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.webkit.GeolocationPermissions.Callback;
+import android.webkit.JsPromptResult;
 import android.webkit.JsResult;
+import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
+import android.webkit.WebSettings.LayoutAlgorithm;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.webkit.GeolocationPermissions.Callback;
-import android.webkit.WebSettings.LayoutAlgorithm;
+import android.widget.EditText;
 import android.widget.LinearLayout;
-import com.phonegap.api.Plugin;
-import com.phonegap.api.PluginManager;
+
 import com.phonegap.api.PhonegapActivity;
+import com.phonegap.api.IPlugin;
+import com.phonegap.api.PluginManager;

 /**
 * This class is the main Android activity that represents the PhoneGap
@@ -53,8 +71,8 @@ import com.phonegap.api.PhonegapActivity;
 *         super.onCreate(savedInstanceState);
 *                  
 *         // Set properties for activity
- *         super.setProperty("loadingDialog", "Title,Message"); // show loading dialog
- *         super.setProperty("errorUrl", "file:///android_asset/www/error.html"); // if error loading file in super.loadUrl().
+ *         super.setStringProperty("loadingDialog", "Title,Message"); // show loading dialog
+ *         super.setStringProperty("errorUrl", "file:///android_asset/www/error.html"); // if error loading file in super.loadUrl().
 *
 *         // Initialize activity
 *         super.init();
@@ -66,7 +84,7 @@ import com.phonegap.api.PhonegapActivity;
 *         super.appView.clearCache(true);
 *         
 *         // Load your application
- *         super.setProperty("splashscreen", R.drawable.splash); // load splash.jpg image from the resource drawable directory
+ *         super.setIntegerProperty("splashscreen", R.drawable.splash); // load splash.jpg image from the resource drawable directory
 *         super.loadUrl("file:///android_asset/www/index.html", 3000); // show splash screen 3 sec before loading app
 *       }
 *     }
@@ -75,30 +93,26 @@ import com.phonegap.api.PhonegapActivity;
 * 
 * 		// Display a native loading dialog.  Format for value = "Title,Message".  
 * 		// (String - default=null)
- * 		super.setProperty("loadingDialog", "Wait,Loading Demo...");
- * 
- * 		// Hide loadingDialog when page loaded instead of when deviceready event
- * 		// occurs. (Boolean - default=false)
- * 		super.setProperty("hideLoadingDialogOnPage", true);
+ * 		super.setStringProperty("loadingDialog", "Wait,Loading Demo...");
 * 
 * 		// Cause all links on web page to be loaded into existing web view, 
 * 		// instead of being loaded into new browser. (Boolean - default=false)
- * 		super.setProperty("loadInWebView", true);
+ * 		super.setBooleanProperty("loadInWebView", true);
 * 
 * 		// Load a splash screen image from the resource drawable directory.
 * 		// (Integer - default=0)
- * 		super.setProperty("splashscreen", R.drawable.splash);
+ * 		super.setIntegerProperty("splashscreen", R.drawable.splash);
 * 
 * 		// Time in msec to wait before triggering a timeout error when loading
 * 		// with super.loadUrl().  (Integer - default=20000)
- * 		super.setProperty("loadUrlTimeoutValue", 60000);
+ * 		super.setIntegerProperty("loadUrlTimeoutValue", 60000);
 * 
 * 		// URL to load if there's an error loading specified URL with loadUrl().  
 * 		// Should be a local URL starting with file://. (String - default=null)
- * 		super.setProperty("errorUrl", "file:///android_asset/www/error.html");
+ * 		super.setStringProperty("errorUrl", "file:///android_asset/www/error.html");
 * 
 * 		// Enable app to keep running in background. (Boolean - default=true)
- * 		super.setProperty("keepRunning", false);
+ * 		super.setBooleanProperty("keepRunning", false);
 */
 public class DroidGap extends PhonegapActivity {

@@ -106,22 +120,26 @@ public class DroidGap extends PhonegapActivity {
 	protected WebView appView;
 	protected WebViewClient webViewClient;

-	private LinearLayout root;
-	private BrowserKey mKey;
+	protected LinearLayout root;
+	public boolean bound = false;
 	public CallbackServer callbackServer;
 	protected PluginManager pluginManager;
 	protected boolean cancelLoadUrl = false;
 	protected boolean clearHistory = false;
+	protected ProgressDialog spinnerDialog = null;

 	// The initial URL for our app
+	// ie http://server/path/index.html#abc?query
 	private String url;
 	
-	// The base of the initial URL for our app
-	private String baseUrl;
+	// The base of the initial URL for our app.
+	// Does not include file name.  Ends with /
+	// ie http://server/path/
+	private String baseUrl = null;

 	// Plugin to call when activity result is received
-	private Plugin activityResultCallback = null;
-	private boolean activityResultKeepRunning;
+	protected IPlugin activityResultCallback = null;
+	protected boolean activityResultKeepRunning;

 	// Flag indicates that a loadUrl timeout occurred
 	private int loadUrlTimeout = 0;
@@ -129,10 +147,6 @@ public class DroidGap extends PhonegapActivity {
 	/*
 	 * The variables below are used to cache some of the activity properties.
 	 */
-	
-	// Flag indicates that "app loading" dialog should be hidden once page is loaded.
-	// The default is to hide it once PhoneGap JavaScript code has initialized.
-	protected boolean hideLoadingDialogOnPageLoad = false;	

 	// Flag indicates that a URL navigated to from PhoneGap app should be loaded into same webview
 	// instead of being loaded into the web browser.  
@@ -163,7 +177,11 @@ public class DroidGap extends PhonegapActivity {
    			WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
    	// This builds the view.  We could probably get away with NOT having a LinearLayout, but I like having a bucket!

-    	root = new LinearLayout(this);
+    	Display display = getWindowManager().getDefaultDisplay(); 
+    	int width = display.getWidth();
+    	int height = display.getHeight();
+    	
+    	root = new LinearLayoutSoftKeyboardDetect(this, width, height);
    	root.setOrientation(LinearLayout.VERTICAL);
    	root.setBackgroundColor(Color.BLACK);
    	root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 
@@ -177,6 +195,8 @@ public class DroidGap extends PhonegapActivity {
    			this.init();
    		}
    	}
+    	// Setup the hardware volume controls to handle volume control
+		setVolumeControlStream(AudioManager.STREAM_MUSIC);
    }
    
    /**
@@ -195,11 +215,11 @@ public class DroidGap extends PhonegapActivity {

        WebViewReflect.checkCompatibility();

-        if (android.os.Build.VERSION.RELEASE.startsWith("2.")) {
-        	this.appView.setWebChromeClient(new EclairClient(DroidGap.this));        	
+        if (android.os.Build.VERSION.RELEASE.startsWith("1.")) {
+        	this.appView.setWebChromeClient(new GapClient(DroidGap.this));
        }
        else {
-        	this.appView.setWebChromeClient(new GapClient(DroidGap.this));
+        	this.appView.setWebChromeClient(new EclairClient(DroidGap.this));        	
        }
           
        this.setWebViewClient(this.appView, new GapViewClient(this));
@@ -215,9 +235,9 @@ public class DroidGap extends PhonegapActivity {
        settings.setLayoutAlgorithm(LayoutAlgorithm.NORMAL);

        // Enable database
-        Package pack = this.getClass().getPackage();
-        String appPackage = pack.getName();
-        WebViewReflect.setStorage(settings, true, "/data/data/" + appPackage + "/app_database/");
+        settings.setDatabaseEnabled(true);
+        String databasePath = this.getApplicationContext().getDir("database", Context.MODE_PRIVATE).getPath(); 
+        settings.setDatabasePath(databasePath);

        // Enable DOM storage
        WebViewReflect.setDomStorage(settings);
@@ -228,7 +248,8 @@ public class DroidGap extends PhonegapActivity {
        // Bind PhoneGap objects to JavaScript
        this.bindBrowser(this.appView);

-        // Add web view
+        // Add web view but make it invisible while loading URL
+        this.appView.setVisibility(View.INVISIBLE);
        root.addView(this.appView);
        setContentView(root);
        
@@ -262,28 +283,7 @@ public class DroidGap extends PhonegapActivity {
 	private void bindBrowser(WebView appView) {
 		this.callbackServer = new CallbackServer();
 		this.pluginManager = new PluginManager(appView, this);
-		this.mKey = new BrowserKey(appView, this);

-		// This creates the new javascript interfaces for PhoneGap
-		appView.addJavascriptInterface(this.pluginManager, "PluginManager");
-		appView.addJavascriptInterface(this.mKey, "BackButton");
-		appView.addJavascriptInterface(this.callbackServer, "CallbackServer");
-
-		this.addService("App", "com.phonegap.App");
-		this.addService("Geolocation", "com.phonegap.GeoBroker");
-		this.addService("Device", "com.phonegap.Device");
-		this.addService("Accelerometer", "com.phonegap.AccelListener");
-		this.addService("Compass", "com.phonegap.CompassListener");
-		this.addService("Media", "com.phonegap.AudioHandler");
-		this.addService("Camera", "com.phonegap.CameraLauncher");
-		this.addService("Contacts", "com.phonegap.ContactManager");
-		this.addService("Crypto", "com.phonegap.CryptoHandler");
-		this.addService("File", "com.phonegap.FileUtils");
-		this.addService("Location", "com.phonegap.GeoBroker");	// Always add Location, even though it is built-in on 2.x devices. Let JavaScript decide which one to use.
-		this.addService("Network Status", "com.phonegap.NetworkManager");
-		this.addService("Notification", "com.phonegap.Notification");
-		this.addService("Storage", "com.phonegap.Storage");
-		this.addService("Temperature", "com.phonegap.TempListener");
 	}
        
 	/**
@@ -300,13 +300,9 @@ public class DroidGap extends PhonegapActivity {
 		// If spashscreen
 		this.splashscreen = this.getIntegerProperty("splashscreen", 0);
 		if (this.splashscreen != 0) {
-			this.appView.setBackgroundColor(0);
-			this.appView.setBackgroundResource(splashscreen);
+			root.setBackgroundResource(this.splashscreen);
 		}

-		// If hideLoadingDialogOnPageLoad
-		this.hideLoadingDialogOnPageLoad = this.getBooleanProperty("hideLoadingDialogOnPageLoad", false);
-
 		// If loadInWebView
 		this.loadInWebView = this.getBooleanProperty("loadInWebView", false);

@@ -328,12 +324,14 @@ public class DroidGap extends PhonegapActivity {
 	public void loadUrl(final String url) {
 		System.out.println("loadUrl("+url+")");
 		this.url = url;
-		int i = url.lastIndexOf('/');
-		if (i > 0) {
-			this.baseUrl = url.substring(0, i);
-		}
-		else {
-			this.baseUrl = this.url;
+		if (this.baseUrl == null) {
+			int i = url.lastIndexOf('/');
+			if (i > 0) {
+				this.baseUrl = url.substring(0, i+1);
+			}
+			else {
+				this.baseUrl = this.url + "/";
+			}
 		}
 		System.out.println("url="+url+" baseUrl="+baseUrl);

@@ -366,10 +364,7 @@ public class DroidGap extends PhonegapActivity {
 							message = loading;
 						}
 					}
-					JSONArray parm = new JSONArray();
-					parm.put(title);
-					parm.put(message);
-					me.pluginManager.exec("Notification", "activityStart", null, parm.toString(), false);
+					me.spinnerStart(title, message);
 				}

 				// Create a timeout timer for loadUrl
@@ -591,34 +586,57 @@ public class DroidGap extends PhonegapActivity {
    public void setDoubleProperty(String name, double value) {
    	this.getIntent().putExtra(name, value);
    }
-
+    
    @Override
    /**
     * Called when the system is about to start resuming a previous activity. 
     */
    protected void onPause() {
        super.onPause();
+        if (this.appView == null) {
+        	return;
+        }
        
+       	// Send pause event to JavaScript
+       	this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};"); 
+
+      	// Forward to plugins
+    	this.pluginManager.onPause(this.keepRunning);
+
        // If app doesn't want to run in background
        if (!this.keepRunning) {
-        	
-        	// Forward to plugins
-        	this.pluginManager.onPause();
-
-        	// Send pause event to JavaScript
-        	this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};");

        	// Pause JavaScript timers (including setInterval)
        	this.appView.pauseTimers();
        }
    }

+    @Override
+    /**
+     * Called when the activity receives a new intent
+     **/
+    protected void onNewIntent(Intent intent) {
+    	super.onNewIntent(intent);
+
+    	//Forward to plugins
+    	this.pluginManager.onNewIntent(intent);
+    }
+    
    @Override
    /**
     * Called when the activity will start interacting with the user. 
     */
    protected void onResume() {
        super.onResume();
+        if (this.appView == null) {
+        	return;
+        }
+
+       	// Send resume event to JavaScript
+       	this.appView.loadUrl("javascript:try{PhoneGap.onResume.fire();}catch(e){};");
+
+      	// Forward to plugins
+    	this.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);

        // If app doesn't want to run in background
        if (!this.keepRunning || this.activityResultKeepRunning) {
@@ -629,12 +647,6 @@ public class DroidGap extends PhonegapActivity {
        		this.activityResultKeepRunning = false;
        	}

-        	// Forward to plugins
-        	this.pluginManager.onResume();
-
-        	// Send resume event to JavaScript
-        	this.appView.loadUrl("javascript:try{PhoneGap.onResume.fire();}catch(e){};");
-
        	// Resume JavaScript timers (including setInterval)
        	this.appView.resumeTimers();
        }
@@ -647,22 +659,21 @@ public class DroidGap extends PhonegapActivity {
    public void onDestroy() {
    	super.onDestroy();
    	
-    	// Make sure pause event is sent if onPause hasn't been called before onDestroy
-       	this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};");
+        if (this.appView != null) {
    	
-    	// Load blank page so that JavaScript onunload is called
-       	this.appView.loadUrl("about:blank");
-    	    	
-    	// Clean up objects
-    	if (this.mKey != null) {
-    	}
-    	
-        // Forward to plugins
-        this.pluginManager.onDestroy();
+        	// Make sure pause event is sent if onPause hasn't been called before onDestroy
+        	this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};");

-    	if (this.callbackServer != null) {
-    		this.callbackServer.destroy();
-    	}
+        	// Send destroy event to JavaScript
+        	this.appView.loadUrl("javascript:try{PhoneGap.onDestroy.fire();}catch(e){};");
+
+        	// Load blank page so that JavaScript onunload is called
+        	this.appView.loadUrl("about:blank");
+    	    	
+        	// Forward to plugins
+        	this.pluginManager.onDestroy();
+
+        }
    }

    /**
@@ -685,13 +696,97 @@ public class DroidGap extends PhonegapActivity {
    	this.callbackServer.sendJavascript(statement);
    }
    
+    
+    /**
+     * Display a new browser with the specified URL.
+     * 
+     * NOTE: If usePhoneGap is set, only trusted PhoneGap URLs should be loaded,
+     *       since any PhoneGap API can be called by the loaded HTML page.
+     *
+     * @param url           The url to load.
+     * @param usePhoneGap   Load url in PhoneGap webview.
+     * @param clearPrev		Clear the activity stack, so new app becomes top of stack
+     * @param params		DroidGap parameters for new app
+     * @throws android.content.ActivityNotFoundException
+     */
+    public void showWebPage(String url, boolean usePhoneGap, boolean clearPrev, HashMap<String, Object> params) throws android.content.ActivityNotFoundException {
+    	Intent intent = null;
+    	if (usePhoneGap) {
+    		intent = new Intent().setClass(this, com.phonegap.DroidGap.class);
+    		intent.putExtra("url", url);
+
+    		// Add parameters
+    		if (params != null) {
+    			java.util.Set<Entry<String,Object>> s = params.entrySet();
+    			java.util.Iterator<Entry<String,Object>> it = s.iterator();
+    			while(it.hasNext()) {
+    				Entry<String,Object> entry = it.next();
+    				String key = entry.getKey();
+    				Object value = entry.getValue();
+    				if (value == null) {
+    				}
+    				else if (value.getClass().equals(String.class)) {
+    					intent.putExtra(key, (String)value);
+    				}
+    				else if (value.getClass().equals(Boolean.class)) {
+    					intent.putExtra(key, (Boolean)value);
+    				}
+    				else if (value.getClass().equals(Integer.class)) {
+    					intent.putExtra(key, (Integer)value);
+    				}
+    			}
+
+    		}                
+    	}
+    	else {
+    		intent = new Intent(Intent.ACTION_VIEW);
+    		intent.setData(Uri.parse(url));
+    	}
+    	this.startActivity(intent);
+    	
+    	// Finish current activity
+		if (clearPrev) {
+			this.finish();
+		}
+    }
+    
+    /**
+     * Show the spinner.  Must be called from the UI thread.
+     * 
+     * @param title			Title of the dialog
+     * @param message		The message of the dialog
+     */
+    public void spinnerStart(final String title, final String message) {
+    	if (this.spinnerDialog != null) {
+    		this.spinnerDialog.dismiss();
+    		this.spinnerDialog = null;
+    	}
+    	final DroidGap me = this;
+    	this.spinnerDialog = ProgressDialog.show(DroidGap.this, title , message, true, true, 
+    			new DialogInterface.OnCancelListener() { 
+    		public void onCancel(DialogInterface dialog) {
+    			me.spinnerDialog = null;
+    		}
+    	});
+    }
+
+    /**
+     * Stop spinner.
+     */
+    public void spinnerStop() {
+    	if (this.spinnerDialog != null) {
+    		this.spinnerDialog.dismiss();
+    		this.spinnerDialog = null;
+		}
+    }
+
    /**
     * Provides a hook for calling "alert" from javascript. Useful for
     * debugging your javascript.
     */
    public class GapClient extends WebChromeClient {

-        private Context ctx;
+        private DroidGap ctx;
        
        /**
         * Constructor.
@@ -699,7 +794,7 @@ public class DroidGap extends PhonegapActivity {
         * @param ctx
         */
        public GapClient(Context ctx) {
-            this.ctx = ctx;
+            this.ctx = (DroidGap)ctx;
        }

        /**
@@ -758,12 +853,104 @@ public class DroidGap extends PhonegapActivity {
            return true;
        }

+        /**
+         * Tell the client to display a prompt dialog to the user. 
+         * If the client returns true, WebView will assume that the client will 
+         * handle the prompt dialog and call the appropriate JsPromptResult method.
+         * 
+         * @param view
+         * @param url
+         * @param message
+         * @param defaultValue
+         * @param result
+         */
+        @Override
+        public boolean onJsPrompt(WebView view, String url, String message, String defaultValue, JsPromptResult result) {
+        	
+        	// Security check to make sure any requests are coming from the page initially
+        	// loaded in webview and not another loaded in an iframe.
+        	boolean reqOk = false;
+        	if (url.indexOf(this.ctx.baseUrl) == 0) {
+        		reqOk = true;
+        	}
+			
+        	// Calling PluginManager.exec() to call a native service using 
+        	// prompt(this.stringify(args), "gap:"+this.stringify([service, action, callbackId, true]));
+        	if (reqOk && defaultValue != null && defaultValue.length() > 3 && defaultValue.substring(0, 4).equals("gap:")) {
+        		JSONArray array;
+        		try {
+        			array = new JSONArray(defaultValue.substring(4));
+        			String service = array.getString(0);
+        			String action = array.getString(1);
+        			String callbackId = array.getString(2);
+        			boolean async = array.getBoolean(3);
+        			String r = pluginManager.exec(service, action, callbackId, message, async);
+        			result.confirm(r);
+        		} catch (JSONException e) {
+        			e.printStackTrace();
+        		}
+        	}
+        	
+        	// Polling for JavaScript messages 
+        	else if (reqOk && defaultValue.equals("gap_poll:")) {
+        		String r = callbackServer.getJavascript();
+        		result.confirm(r);
+        	}
+        	
+        	// Calling into CallbackServer
+        	else if (reqOk && defaultValue.equals("gap_callbackServer:")) {
+        		String r = "";
+        		if (message.equals("usePolling")) {
+        			r = ""+callbackServer.usePolling();
+        		}
+        		else if (message.equals("restartServer")) {
+        			callbackServer.restartServer();
+        		}
+        		else if (message.equals("getPort")) {
+        			r = Integer.toString(callbackServer.getPort());
+        		}
+        		else if (message.equals("getToken")) {
+        			r = callbackServer.getToken();
+        		}
+        		result.confirm(r);
+        	}
+        	
+        	// Show dialog
+        	else {
+				final JsPromptResult res = result;
+				AlertDialog.Builder dlg = new AlertDialog.Builder(this.ctx);
+				dlg.setMessage(message);
+				final EditText input = new EditText(this.ctx);
+				if (defaultValue != null) {
+					input.setText(defaultValue);
+				}
+				dlg.setView(input);
+				dlg.setCancelable(false);
+				dlg.setPositiveButton(android.R.string.ok, 
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+						String usertext = input.getText().toString();
+						res.confirm(usertext);
+					}
+				});
+				dlg.setNegativeButton(android.R.string.cancel, 
+					new DialogInterface.OnClickListener() {
+						public void onClick(DialogInterface dialog, int which) {
+						res.cancel();
+					}
+				});
+				dlg.create();
+				dlg.show();
+			}
+        	return true;
+        }
+        
    }

    /**
     * WebChromeClient that extends GapClient with additional support for Android 2.X
     */
-    public final class EclairClient extends GapClient {
+    public class EclairClient extends GapClient {

    	private String TAG = "PhoneGapLog";
    	private long MAX_QUOTA = 100 * 1024 * 1024;
@@ -817,6 +1004,12 @@ public class DroidGap extends PhonegapActivity {
    	}

    	@Override
+    	/**
+    	 * Instructs the client to show a prompt to ask the user to set the Geolocation permission state for the specified origin. 
+    	 * 
+    	 * @param origin
+    	 * @param callback
+    	 */
    	public void onGeolocationPermissionsShowPrompt(String origin, Callback callback) {
    		// TODO Auto-generated method stub
    		super.onGeolocationPermissionsShowPrompt(origin, callback);
@@ -887,32 +1080,64 @@ public class DroidGap extends PhonegapActivity {
        		return true;        		
        	}
        	
-        	// If sms:5551212
-            else if (url.startsWith("sms:")) {
-            	try {
-            		Intent intent = new Intent(Intent.ACTION_VIEW);
-            		intent.setData(Uri.parse(url));
-            		intent.putExtra("address", url.substring(4));
-            		intent.setType("vnd.android-dir/mms-sms");
-            		startActivity(intent);
-            	} catch (android.content.ActivityNotFoundException e) {
-            		System.out.println("Error sending sms "+url+":"+ e.toString());
-            	}
-            	return true;
-            }  	
+        	// If sms:5551212?body=This is the message
+        	else if (url.startsWith("sms:")) {
+        		try {
+        			Intent intent = new Intent(Intent.ACTION_VIEW);

-        	// If http, https or file
-        	else if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("file://")) {
+        			// Get address
+        			String address = null;
+        			int parmIndex = url.indexOf('?');
+        			if (parmIndex == -1) {
+        				address = url.substring(4);
+        			}
+        			else {
+        				address = url.substring(4, parmIndex);

-        		int i = url.lastIndexOf('/');
-        		String newBaseUrl = url;
-        		if (i > 0) {
-        			newBaseUrl = url.substring(0, i);
+        				// If body, then set sms body
+        				Uri uri = Uri.parse(url);
+        				String query = uri.getQuery();
+        				if (query != null) {
+        					if (query.startsWith("body=")) {
+        						intent.putExtra("sms_body", query.substring(5));
+        					}
+        				}
+        			}
+        			intent.setData(Uri.parse("sms:"+address));
+        			intent.putExtra("address", address);
+        			intent.setType("vnd.android-dir/mms-sms");
+        			startActivity(intent);
+        		} catch (android.content.ActivityNotFoundException e) {
+        			System.out.println("Error sending sms "+url+":"+ e.toString());
        		}
+        		return true;
+        	}
+
+        	// All else
+        	else {

        		// If our app or file:, then load into our webview
-        		if (this.ctx.loadInWebView || url.startsWith("file://") || this.ctx.baseUrl.equals(newBaseUrl)) {
-        			this.ctx.appView.loadUrl(url);
+        		// NOTE: This replaces our app with new URL.  When BACK is pressed,
+        		//       our app is reloaded and restarted.  All state is lost.
+        		if (this.ctx.loadInWebView || url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0) {
+        			try {
+        				// Init parameters to new DroidGap activity and propagate existing parameters
+        				HashMap<String, Object> params = new HashMap<String, Object>();
+        				params.put("loadingDialog", null);
+        				if (this.ctx.loadInWebView) {
+        					params.put("loadInWebView", true);
+        				}
+        				params.put("keepRunning", this.ctx.keepRunning);
+        				params.put("loadUrlTimeoutValue", this.ctx.loadUrlTimeoutValue);
+        				String errorUrl = this.ctx.getStringProperty("errorUrl", null);
+        				if (errorUrl != null) {
+        					params.put("errorUrl", errorUrl);
+        				}
+
+        				this.ctx.showWebPage(url, true, false, params);
+        			} catch (android.content.ActivityNotFoundException e) {
+        				System.out.println("Error loading url into DroidGap - "+url+":"+ e.toString());
+        			}
        		}
  		
        		// If not our application, let default viewer handle
@@ -927,8 +1152,6 @@ public class DroidGap extends PhonegapActivity {
        		}
        		return true;
        	}
-        	
-        	return false;
        }
    	
        /**
@@ -947,25 +1170,28 @@ public class DroidGap extends PhonegapActivity {
        	// Try firing the onNativeReady event in JS. If it fails because the JS is
        	// not loaded yet then just set a flag so that the onNativeReady can be fired
        	// from the JS side when the JS gets to that code.
-        	appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
+        	if (!url.equals("about:blank")) {
+        		appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
+        	}

-    		// If splash screen is showing, clear it
-    		if (this.ctx.splashscreen != 0) {
-    			this.ctx.splashscreen = 0;
-    	    	appView.setBackgroundResource(0);
-    		}
+        	// Make app view visible
+        	appView.setVisibility(View.VISIBLE);

        	// Stop "app loading" spinner if showing
-        	if (this.ctx.hideLoadingDialogOnPageLoad) {
-        		this.ctx.hideLoadingDialogOnPageLoad = false;
-        		this.ctx.pluginManager.exec("Notification", "activityStop", null, "[]", false);
-        	}
+       		this.ctx.spinnerStop();

    		// Clear history, so that previous screen isn't there when Back button is pressed
    		if (this.ctx.clearHistory) {
    			this.ctx.clearHistory = false;
    			this.ctx.appView.clearHistory();
    		}
+    		
+    		// Shutdown if blank loaded
+    		if (url.equals("about:blank")) {
+    			if (this.ctx.callbackServer != null) {
+    				this.ctx.callbackServer.destroy();
+    			}
+    		}
        }
        
        /**
@@ -985,11 +1211,32 @@ public class DroidGap extends PhonegapActivity {
        	this.ctx.loadUrlTimeout++;

       	 	// Stop "app loading" spinner if showing
-       	 	this.ctx.pluginManager.exec("Notification", "activityStop", null, "[]", false);
+       		this.ctx.spinnerStop();

        	// Handle error
        	this.ctx.onReceivedError(errorCode, description, failingUrl);
        }
+        
+        public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+            
+        	final String packageName = this.ctx.getPackageName();
+    	    final PackageManager pm = this.ctx.getPackageManager();
+    	    ApplicationInfo appInfo;
+    		try {
+    			appInfo = pm.getApplicationInfo(packageName, PackageManager.GET_META_DATA);
+    	        if ((appInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
+    	            // debug = true
+    	        	handler.proceed();
+    	            return;
+    	        } else {
+    	            // debug = false
+    	        	super.onReceivedSslError(view, handler, error);    
+    	        }
+    		} catch (NameNotFoundException e) {
+    			// When it doubt, lock it out!
+    			super.onReceivedSslError(view, handler, error);
+    		}
+        }
    }
    
    /**
@@ -1000,13 +1247,17 @@ public class DroidGap extends PhonegapActivity {
     */
    @Override
    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (this.appView == null) {
+        	return super.onKeyDown(keyCode, event);
+        }

    	// If back key
    	if (keyCode == KeyEvent.KEYCODE_BACK) {

    		// If back key is bound, then send event to JavaScript
-    		if (mKey.isBound()) {
-    			this.appView.loadUrl("javascript:document.keyEvent.backTrigger()");
+    		if (this.bound) {
+    			this.appView.loadUrl("javascript:PhoneGap.fireEvent('backbutton');");
+    			return true;
    		}

    		// If not bound
@@ -1015,6 +1266,7 @@ public class DroidGap extends PhonegapActivity {
    			// Go to previous page in webview if it is possible to go back
    			if (this.appView.canGoBack()) {
    				this.appView.goBack();
+    				return true;
    			}

    			// If not, then invoke behavior of super class
@@ -1026,12 +1278,14 @@ public class DroidGap extends PhonegapActivity {

    	// If menu key
    	else if (keyCode == KeyEvent.KEYCODE_MENU) {
-    		appView.loadUrl("javascript:keyEvent.menuTrigger()");
+    		this.appView.loadUrl("javascript:PhoneGap.fireEvent('menubutton');");
+    		return true;
    	}

    	// If search key
    	else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
-    		appView.loadUrl("javascript:keyEvent.searchTrigger()");
+    		this.appView.loadUrl("javascript:PhoneGap.fireEvent('searchbutton');");
+    		return true;
    	}

    	return false;
@@ -1051,12 +1305,7 @@ public class DroidGap extends PhonegapActivity {
    @Override
    public void startActivityForResult(Intent intent, int requestCode) throws RuntimeException {
    	System.out.println("startActivityForResult(intent,"+requestCode+")");
-    	if (requestCode == -1) {
-    		super.startActivityForResult(intent, requestCode);
-    	}
-    	else {
-    		throw new RuntimeException("PhoneGap Exception: Call startActivityForResult(Command, Intent) instead.");
-    	}
+    	super.startActivityForResult(intent, requestCode);
    }

    /**
@@ -1067,7 +1316,7 @@ public class DroidGap extends PhonegapActivity {
     * @param intent			The intent to start
     * @param requestCode		The request code that is passed to callback to identify the activity
     */
-    public void startActivityForResult(Plugin command, Intent intent, int requestCode) {
+    public void startActivityForResult(IPlugin command, Intent intent, int requestCode) {
    	this.activityResultCallback = command;
    	this.activityResultKeepRunning = this.keepRunning;
    	
@@ -1092,12 +1341,17 @@ public class DroidGap extends PhonegapActivity {
     */
     protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
    	 super.onActivityResult(requestCode, resultCode, intent);
-    	 Plugin callback = this.activityResultCallback;
+    	 IPlugin callback = this.activityResultCallback;
    	 if (callback != null) {
    		 callback.onActivityResult(requestCode, resultCode, intent);
    	 }        
     }
-   
+
+     @Override
+     public void setActivityResultCallback(IPlugin plugin) {
+    	 this.activityResultCallback = plugin;
+     }
+     
     /**
      * Report an error to the host application. These errors are unrecoverable (i.e. the main resource is unavailable). 
      * The errorCode parameter corresponds to one of the ERROR_* constants.
@@ -1158,4 +1412,84 @@ public class DroidGap extends PhonegapActivity {
    		 }
    	 });
     }
+     
+     /**
+      * We are providing this class to detect when the soft keyboard is shown 
+      * and hidden in the web view.
+      */
+     class LinearLayoutSoftKeyboardDetect extends LinearLayout {
+
+    	    private static final String LOG_TAG = "SoftKeyboardDetect";
+    	    
+    	    private int oldHeight = 0;	// Need to save the old height as not to send redundant events
+    	    private int oldWidth = 0; // Need to save old width for orientation change    	    
+    	    private int screenWidth = 0;
+    	    private int screenHeight = 0;
+    	        	    
+			public LinearLayoutSoftKeyboardDetect(Context context, int width, int height) {
+    	    	super(context);   	
+    	        screenWidth = width;
+    	        screenHeight = height;      	        
+    	    }
+
+    	    @Override
+    	    /**
+    	     * Start listening to new measurement events.  Fire events when the height 
+    	     * gets smaller fire a show keyboard event and when height gets bigger fire 
+    	     * a hide keyboard event.
+    	     * 
+    	     * Note: We are using callbackServer.sendJavascript() instead of 
+    	     * this.appView.loadUrl() as changing the URL of the app would cause the 
+    	     * soft keyboard to go away.
+    	     * 
+    	     * @param widthMeasureSpec
+    	     * @param heightMeasureSpec
+    	     */
+    	    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    	        super.onMeasure(widthMeasureSpec, heightMeasureSpec);       
+    	        
+    	    	Log.d(LOG_TAG, "We are in our onMeasure method");
+
+    	    	// Get the current height of the visible part of the screen.
+    	    	// This height will not included the status bar.
+    	    	int height = MeasureSpec.getSize(heightMeasureSpec);
+    	        int width = MeasureSpec.getSize(widthMeasureSpec);
+    	        
+    	        Log.d(LOG_TAG, "Old Height = " + oldHeight);
+    	        Log.d(LOG_TAG, "Height = " + height);  	       
+    	        Log.d(LOG_TAG, "Old Width = " + oldWidth);
+    	        Log.d(LOG_TAG, "Width = " + width);
+    	        
+    	        
+    	        // If the oldHeight = 0 then this is the first measure event as the app starts up.
+    	        // If oldHeight == height then we got a measurement change that doesn't affect us.
+    	        if (oldHeight == 0 || oldHeight == height) {
+    	        	Log.d(LOG_TAG, "Ignore this event");
+    	        }
+    	        // Account for orientation change and ignore this event/Fire orientation change
+    	        else if(screenHeight == width)
+    	        {
+    	        	int tmp_var = screenHeight;
+    	        	screenHeight = screenWidth;
+    	        	screenWidth = tmp_var;
+    	        	Log.d(LOG_TAG, "Orientation Change");
+    	        }
+    	        // If the height as gotten bigger then we will assume the soft keyboard has 
+    	        // gone away.
+    	        else if (height > oldHeight) {
+    	        	Log.d(LOG_TAG, "Throw hide keyboard event");
+    	        	callbackServer.sendJavascript("PhoneGap.fireEvent('hidekeyboard');");
+    	        } 
+    	        // If the height as gotten smaller then we will assume the soft keyboard has 
+    	        // been displayed.
+    	        else if (height < oldHeight) {
+    	        	Log.d(LOG_TAG, "Throw show keyboard event");
+    	        	callbackServer.sendJavascript("PhoneGap.fireEvent('showkeyboard');");
+    	        }
+
+    	        // Update the old height for the next event
+    	        oldHeight = height;
+    	        oldWidth = width;
+    	    }
+    }
 }
--- a/framework/src/com/phonegap/FileTransfer.java
+++ b/framework/src/com/phonegap/FileTransfer.java
@@ -0,0 +1,365 @@
+/*
+ * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ * 
+ * Copyright (c) 2005-2010, Nitobi Software Inc.
+ * Copyright (c) 2010, IBM Corporation
+ */
+package com.phonegap;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Iterator;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.net.Uri;
+import android.util.Log;
+import android.webkit.CookieManager;
+
+import com.phonegap.api.Plugin;
+import com.phonegap.api.PluginResult;
+
+public class FileTransfer extends Plugin {
+
+	private static final String LOG_TAG = "FileUploader";
+	private static final String LINE_START = "--";
+	private static final String LINE_END = "\r\n";
+	private static final String BOUNDRY =  "*****";
+
+	public static int FILE_NOT_FOUND_ERR = 1;
+    public static int INVALID_URL_ERR = 2;
+    public static int CONNECTION_ERR = 3;
+    
+    private SSLSocketFactory defaultSSLSocketFactory = null;
+    private HostnameVerifier defaultHostnameVerifier = null;
+
+	/* (non-Javadoc)
+	* @see com.phonegap.api.Plugin#execute(java.lang.String, org.json.JSONArray, java.lang.String)
+	*/
+	@Override
+	public PluginResult execute(String action, JSONArray args, String callbackId) {
+		String file = null;
+		String server = null;
+		try {
+			file = args.getString(0);
+			server = args.getString(1);
+		}
+		catch (JSONException e) {
+			Log.d(LOG_TAG, "Missing filename or server name");
+			return new PluginResult(PluginResult.Status.JSON_EXCEPTION, "Missing filename or server name");
+		}
+		
+		// Setup the options
+		String fileKey = null;
+		String fileName = null;
+		String mimeType = null;		
+		
+		fileKey = getArgument(args, 2, "file");		
+		fileName = getArgument(args, 3, "image.jpg");
+		mimeType = getArgument(args, 4, "image/jpeg");
+
+		try {
+			JSONObject params = args.optJSONObject(5);
+			boolean trustEveryone = args.optBoolean(6);
+
+			if (action.equals("upload")) {
+				FileUploadResult r = upload(file, server, fileKey, fileName, mimeType, params, trustEveryone);
+				Log.d(LOG_TAG, "****** About to return a result from upload");
+				return new PluginResult(PluginResult.Status.OK, r.toJSONObject());
+			} else {
+	            return new PluginResult(PluginResult.Status.INVALID_ACTION);
+			}
+		} catch (FileNotFoundException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			JSONObject error = createFileUploadError(FILE_NOT_FOUND_ERR);
+            return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
+        } catch (IllegalArgumentException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			JSONObject error = createFileUploadError(INVALID_URL_ERR);
+            return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
+		} catch (SSLException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			Log.d(LOG_TAG, "Got my ssl exception!!!");
+			JSONObject error = createFileUploadError(CONNECTION_ERR);
+            return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
+        } catch (IOException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			JSONObject error = createFileUploadError(CONNECTION_ERR);
+            return new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
+		} catch (JSONException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
+		}
+	}
+
+	// always verify the host - don't check for certificate
+	final static HostnameVerifier DO_NOT_VERIFY = new HostnameVerifier() {
+		public boolean verify(String hostname, SSLSession session) {
+			return true;
+        }
+	};
+
+	/**
+	 * This function will install a trust manager that will blindly trust all SSL 
+	 * certificates.  The reason this code is being added is to enable developers 
+	 * to do development using self signed SSL certificates on their web server.
+	 * 
+	 * The standard HttpsURLConnection class will throw an exception on self 
+	 * signed certificates if this code is not run.
+	 */
+	private void trustAllHosts() {
+        // Create a trust manager that does not validate certificate chains
+        TrustManager[] trustAllCerts = new TrustManager[] { new X509TrustManager() {
+            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
+            	return new java.security.cert.X509Certificate[] {};
+            }
+
+            public void checkClientTrusted(X509Certificate[] chain,
+                            String authType) throws CertificateException {
+            }
+
+            public void checkServerTrusted(X509Certificate[] chain,
+                            String authType) throws CertificateException {
+            }
+        } };
+
+        // Install the all-trusting trust manager
+        try {
+        	// Backup the current SSL socket factory
+        	defaultSSLSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
+        	// Install our all trusting manager
+        	SSLContext sc = SSLContext.getInstance("TLS");
+            sc.init(null, trustAllCerts, new java.security.SecureRandom());
+            HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+        } catch (Exception e) {
+            Log.e(LOG_TAG, e.getMessage(), e);
+        }
+	}
+
+	/**
+	 * Create an error object based on the passed in errorCode
+	 * @param errorCode 	the error 
+	 * @return JSONObject containing the error
+	 */
+	private JSONObject createFileUploadError(int errorCode) {
+		JSONObject error = null;
+		try {
+			error = new JSONObject();
+			error.put("code", errorCode);
+		} catch (JSONException e) {
+			Log.e(LOG_TAG, e.getMessage(), e);
+		}
+		return error;
+	}
+
+	/**
+	 * Convenience method to read a parameter from the list of JSON args.
+	 * @param args			the args passed to the Plugin
+	 * @param position		the position to retrieve the arg from
+	 * @param defaultString the default to be used if the arg does not exist
+	 * @return String with the retrieved value
+	 */
+	private String getArgument(JSONArray args, int position, String defaultString) {
+		String arg = defaultString;
+		if(args.length() >= position) {
+			arg = args.optString(position);
+			if (arg == null || "null".equals(arg)) {
+				arg = defaultString;
+			}
+		}
+		return arg;
+	}
+	
+    /**
+     * Uploads the specified file to the server URL provided using an HTTP 
+     * multipart request. 
+     * @param file      Full path of the file on the file system
+     * @param server        URL of the server to receive the file
+     * @param fileKey       Name of file request parameter
+     * @param fileName      File name to be used on server
+     * @param mimeType      Describes file content type
+     * @param params        key:value pairs of user-defined parameters
+     * @return FileUploadResult containing result of upload request
+     */
+	public FileUploadResult upload(String file, String server, final String fileKey, final String fileName, 
+			final String mimeType, JSONObject params, boolean trustEveryone) throws IOException, SSLException {
+		// Create return object
+		FileUploadResult result = new FileUploadResult();
+		
+		// Get a input stream of the file on the phone
+		InputStream fileInputStream = getPathFromUri(file);
+
+		HttpURLConnection conn = null;
+		DataOutputStream dos = null;
+
+		int bytesRead, bytesAvailable, bufferSize;
+		long totalBytes;
+		byte[] buffer;
+		int maxBufferSize = 8096;
+
+		//------------------ CLIENT REQUEST
+		// open a URL connection to the server 
+		URL url = new URL(server);
+		
+		// Open a HTTP connection to the URL based on protocol 
+        if (url.getProtocol().toLowerCase().equals("https")) {
+    		// Using standard HTTPS connection. Will not allow self signed certificate
+        	if (!trustEveryone) {
+        		conn = (HttpsURLConnection) url.openConnection();
+        	}
+        	// Use our HTTPS connection that blindly trusts everyone.
+        	// This should only be used in debug environments
+        	else {
+        		// Setup the HTTPS connection class to trust everyone
+	            trustAllHosts();
+	            HttpsURLConnection https = (HttpsURLConnection) url.openConnection();
+	            // Save the current hostnameVerifier
+	            defaultHostnameVerifier = https.getHostnameVerifier();
+	            // Setup the connection not to verify hostnames 
+	            https.setHostnameVerifier(DO_NOT_VERIFY);
+	        	conn = https;
+        	}
+        } 
+        // Return a standard HTTP conneciton
+        else {
+        	conn = (HttpURLConnection) url.openConnection();
+        }
+		
+		// Allow Inputs
+		conn.setDoInput(true);
+		
+		// Allow Outputs
+		conn.setDoOutput(true);
+		
+		// Don't use a cached copy.
+		conn.setUseCaches(false);
+		
+		// Use a post method.
+		conn.setRequestMethod("POST");
+		conn.setRequestProperty("Connection", "Keep-Alive");
+		conn.setRequestProperty("Content-Type", "multipart/form-data;boundary="+BOUNDRY);
+
+		// Set the cookies on the response
+		String cookie = CookieManager.getInstance().getCookie(server);
+		if (cookie != null) {
+			conn.setRequestProperty("Cookie", cookie);
+		}
+
+		dos = new DataOutputStream( conn.getOutputStream() );
+
+		// Send any extra parameters
+		try {
+			for (Iterator iter = params.keys(); iter.hasNext();) {
+				Object key = iter.next();
+				dos.writeBytes(LINE_START + BOUNDRY + LINE_END); 
+				dos.writeBytes("Content-Disposition: form-data; name=\"" +  key.toString() + "\";");
+				dos.writeBytes(LINE_END + LINE_END); 
+				dos.writeBytes(params.getString(key.toString()));
+				dos.writeBytes(LINE_END); 
+			}
+		} catch (JSONException e) {
+			Log.e(LOG_TAG, e.getMessage(), e); 
+		}
+		
+		dos.writeBytes(LINE_START + BOUNDRY + LINE_END);
+		dos.writeBytes("Content-Disposition: form-data; name=\"" + fileKey + "\";" + " filename=\"" + fileName +"\"" + LINE_END);
+		dos.writeBytes("Content-Type: " + mimeType + LINE_END); 
+		dos.writeBytes(LINE_END);
+		
+		// create a buffer of maximum size
+		bytesAvailable = fileInputStream.available();
+		bufferSize = Math.min(bytesAvailable, maxBufferSize);
+		buffer = new byte[bufferSize];
+		
+		// read file and write it into form...
+		bytesRead = fileInputStream.read(buffer, 0, bufferSize);
+		totalBytes = 0;
+
+		while (bytesRead > 0) {
+			totalBytes += bytesRead;
+			result.setBytesSent(totalBytes);
+			dos.write(buffer, 0, bufferSize);
+			bytesAvailable = fileInputStream.available();
+			bufferSize = Math.min(bytesAvailable, maxBufferSize);
+			bytesRead = fileInputStream.read(buffer, 0, bufferSize);
+		}
+
+		// send multipart form data necesssary after file data...
+		dos.writeBytes(LINE_END);
+		dos.writeBytes(LINE_START + BOUNDRY + LINE_START + LINE_END);
+		
+		// close streams
+		fileInputStream.close();
+		dos.flush();
+		dos.close();
+
+		//------------------ read the SERVER RESPONSE
+		StringBuffer responseString = new StringBuffer("");
+		DataInputStream inStream;
+		try {
+			inStream = new DataInputStream ( conn.getInputStream() );
+		} catch(FileNotFoundException e) {
+			throw new IOException("Received error from server");
+		}
+		
+		String line;
+		while (( line = inStream.readLine()) != null) {
+			responseString.append(line);
+		}
+		Log.d(LOG_TAG, "got response from server");
+		Log.d(LOG_TAG, responseString.toString());
+
+		// send request and retrieve response
+        result.setResponseCode(conn.getResponseCode());
+        result.setResponse(responseString.toString());
+
+        inStream.close();
+        conn.disconnect();
+        
+        // Revert back to the proper verifier and socket factories
+        if (trustEveryone && url.getProtocol().toLowerCase().equals("https")) {
+        	((HttpsURLConnection)conn).setHostnameVerifier(defaultHostnameVerifier);
+        	HttpsURLConnection.setDefaultSSLSocketFactory(defaultSSLSocketFactory);
+        }        
+        
+		return result;
+	}
+
+	/**
+     * Get an input stream based on file path or content:// uri
+     * 
+     * @param path
+     * @return an input stream
+     * @throws FileNotFoundException 
+     */
+    private InputStream getPathFromUri(String path) throws FileNotFoundException {  	  
+    	if (path.startsWith("content:")) {
+    		Uri uri = Uri.parse(path);
+    		return ctx.getContentResolver().openInputStream(uri);
+    	}
+    	else {
+    		return new FileInputStream(path);
+    	}
+    }  
+
+}
--- a/framework/src/com/phonegap/FileUploadResult.java
+++ b/framework/src/com/phonegap/FileUploadResult.java
@@ -0,0 +1,52 @@
+/*
+ * PhoneGap is available under *either* the terms of the modified BSD license *or* the
+ * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
+ * 
+ * Copyright (c) 2005-2010, Nitobi
+ * Copyright (c) 2010, IBM Corporation
+ */ 
+package com.phonegap;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Encapsulates the result and/or status of uploading a file to a remote server.
+ */
+public class FileUploadResult {
+    
+    private long bytesSent = 0;         // bytes sent
+    private int responseCode = -1;      // HTTP response code
+    private String response = null;     // HTTP response
+       
+    public long getBytesSent() {
+        return bytesSent;
+    }
+    
+    public void setBytesSent(long bytes) {
+        this.bytesSent = bytes;
+    }
+    
+    public int getResponseCode() {
+        return responseCode;
+    }
+    
+    public void setResponseCode(int responseCode) {
+        this.responseCode = responseCode;
+    }
+    
+    public String getResponse() {
+        return response;
+    }
+    
+    public void setResponse(String response) {
+        this.response = response;
+    }
+
+    public JSONObject toJSONObject() throws JSONException {
+        return new JSONObject(
+                "{bytesSent:" + bytesSent + 
+                ",responseCode:" + responseCode + 
+                ",response:" + JSONObject.quote(response) + "}");
+    }
+}
--- a/framework/src/com/phonegap/FileUtils.java
+++ b/framework/src/com/phonegap/FileUtils.java
--- a/framework/src/com/phonegap/GeoListener.java
+++ b/framework/src/com/phonegap/GeoListener.java
@@ -86,7 +86,7 @@ public class GeoListener {
 	 * @param msg			The error message
 	 */
 	void fail(int code, String msg) {
-		this.broker.sendJavascript("navigator._geo.fail('" + this.id + "', " + ", " + code + ", '" + msg + "');");
+		this.broker.sendJavascript("navigator._geo.fail('" + this.id + "', '" + code + "', '" + msg + "');");
 		this.stop();
 	}
 	
--- a/framework/src/com/phonegap/NetworkManager.java
+++ b/framework/src/com/phonegap/NetworkManager.java
@@ -3,34 +3,65 @@
 * MIT License (2008). See http://opensource.org/licenses/alphabetical for full text.
 * 
 * Copyright (c) 2005-2010, Nitobi Software Inc.
- * Copyright (c) 2010, IBM Corporation
+ * Copyright (c) 2010-2011, IBM Corporation
 */
 package com.phonegap;

-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.json.JSONArray;
-import org.json.JSONException;

 import com.phonegap.api.PhonegapActivity;
 import com.phonegap.api.Plugin;
 import com.phonegap.api.PluginResult;

+import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.net.*;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.util.Log;

 public class NetworkManager extends Plugin {
 	
-	public static int NOT_REACHABLE = 0;
+    public static int NOT_REACHABLE = 0;
 	public static int REACHABLE_VIA_CARRIER_DATA_NETWORK = 1;
 	public static int REACHABLE_VIA_WIFI_NETWORK = 2;
+
+	public static final String WIFI = "wifi";
+	public static final String WIMAX = "wimax";
+	// mobile
+	public static final String MOBILE = "mobile";
+	// 2G network types
+	public static final String GSM = "gsm";
+	public static final String GPRS = "gprs";
+	public static final String EDGE = "edge";
+	// 3G network types
+	public static final String CDMA = "cdma";
+	public static final String UMTS = "umts";
+	// 4G network types
+	public static final String LTE = "lte";
+	public static final String UMB = "umb";
+	// return types
+	public static final String TYPE_UNKNOWN = "unknown";
+	public static final String TYPE_ETHERNET = "ethernet";
+	public static final String TYPE_WIFI = "wifi";
+	public static final String TYPE_2G = "2g";
+	public static final String TYPE_3G = "3g";
+	public static final String TYPE_4G = "4g";
+	public static final String TYPE_NONE = "none";
 	
-    ConnectivityManager sockMan;
+	private static final String LOG_TAG = "NetworkManager";
+
+	private String connectionCallbackId;
+
+	ConnectivityManager sockMan;
+	BroadcastReceiver receiver;
 	
 	/**
 	 * Constructor.
 	 */
 	public NetworkManager()	{
+		this.receiver = null;
 	}

 	/**
@@ -41,9 +72,24 @@ public class NetworkManager extends Plugin {
 	 */
 	public void setContext(PhonegapActivity ctx) {
 		super.setContext(ctx);
-		this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);
-	}
+		this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);		
+		this.connectionCallbackId = null;
+		
+		// We need to listen to connectivity events to update navigator.connection
+		IntentFilter intentFilter = new IntentFilter() ;
+		intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
+		if (this.receiver == null) {
+			this.receiver = new BroadcastReceiver() {
+				@Override
+				public void onReceive(Context context, Intent intent) {				
+					updateConnectionInfo((NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));				
+				}
+			};
+			ctx.registerReceiver(this.receiver, intentFilter);
+		}

+	}
+	
 	/**
 	 * Executes the request and returns PluginResult.
 	 * 
@@ -53,25 +99,18 @@ public class NetworkManager extends Plugin {
 	 * @return 				A PluginResult object with a status and message.
 	 */
 	public PluginResult execute(String action, JSONArray args, String callbackId) {
-		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		try {
-			if (action.equals("isAvailable")) {
-				boolean b = this.isAvailable();
-				return new PluginResult(status, b);
-			}
-			else if (action.equals("isWifiActive")) {
-				boolean b = this.isWifiActive();
-				return new PluginResult(status, b);
-			}
-			else if (action.equals("isReachable")) {
-				int i = this.isReachable(args.getString(0), args.getBoolean(1));
-				return new PluginResult(status, i);
-			}
-			return new PluginResult(status, result);
-		} catch (JSONException e) {
-			return new PluginResult(PluginResult.Status.JSON_EXCEPTION);
+		PluginResult.Status status = PluginResult.Status.INVALID_ACTION;
+		String result = "Unsupported Operation: " + action;	
+		
+		if (action.equals("getConnectionInfo")) {
+			this.connectionCallbackId = callbackId;
+			NetworkInfo info = sockMan.getActiveNetworkInfo();
+			PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, this.getConnectionInfo(info));
+			pluginResult.setKeepCallback(true);
+			return pluginResult;
 		}
+		
+		return new PluginResult(status, result);
 	}

 	/**
@@ -84,70 +123,100 @@ public class NetworkManager extends Plugin {
 		// All methods take a while, so always use async
 		return false;
 	}
+	
+	/**
+	 * Stop network receiver.
+	 */
+	public void onDestroy() {
+		if (this.receiver != null) {
+			try {
+				this.ctx.unregisterReceiver(this.receiver);
+			} catch (Exception e) {
+				Log.e(LOG_TAG, "Error unregistering network receiver: " + e.getMessage(), e);
+			}
+		}
+	}

    //--------------------------------------------------------------------------
    // LOCAL METHODS
    //--------------------------------------------------------------------------

-    /**
-     * Determine if a network connection exists.
-     * 
-     * @return
-     */
-	public boolean isAvailable() {
-		NetworkInfo info = sockMan.getActiveNetworkInfo();
-		boolean conn = false;
-		if (info != null) {
-			conn = info.isConnected();
-		}
-		return conn;
-	}
-	
+
 	/**
-	 * Determine if a WIFI connection exists.
+	 * Updates the JavaScript side whenever the connection changes
 	 * 
+	 * @param info the current active network info
 	 * @return
 	 */
-	public boolean isWifiActive() {
-		NetworkInfo info = sockMan.getActiveNetworkInfo();
-		if (info != null) {
-			String type = info.getTypeName();
-			return type.equals("WIFI");
-		}
-		return false;
+	private void updateConnectionInfo(NetworkInfo info) {	 
+        // send update to javascript "navigator.network.connection"
+        sendUpdate(this.getConnectionInfo(info));
 	}
-	
-	/**
-	 * Determine if a URI is reachable over the network.
+
+	/** 
+	 * Get the latest network connection information
 	 * 
-	 * @param uri
-	 * @param isIpAddress
-	 * @return
+	 * @param info the current active network info
+	 * @return a JSONObject that represents the network info
 	 */
-	public int isReachable(String uri, boolean isIpAddress) {
-		int reachable = NOT_REACHABLE;
-		
-		if (uri.indexOf("http://") == -1) {
-			uri = "http://" + uri;
-		}
-
-		if (this.isAvailable()) {
-			try {
-				DefaultHttpClient httpclient = new DefaultHttpClient();
-				HttpGet httpget = new HttpGet(uri);
-				httpclient.execute(httpget);			
-
-				if (this.isWifiActive()) {
-					reachable = REACHABLE_VIA_WIFI_NETWORK;
-				}
-				else {
-					reachable = REACHABLE_VIA_CARRIER_DATA_NETWORK;
-				}
-			} catch (Exception e) { 
-				reachable = NOT_REACHABLE;
+	private String getConnectionInfo(NetworkInfo info) {
+	    String type = TYPE_NONE;
+		if (info != null) {
+			// If we are not connected to any network set type to none
+			if (!info.isConnected()) {
+				type = TYPE_NONE;
+			}			
+			else {
+				type = getType(info);
 			}
 		}
-				
-		return reachable;
+        return type;
+	}
+	
+	/**
+	 * Create a new plugin result and send it back to JavaScript
+	 * 
+	 * @param connection the network info to set as navigator.connection
+	 */
+	private void sendUpdate(String type) {
+		PluginResult result = new PluginResult(PluginResult.Status.OK, type);
+		result.setKeepCallback(true);
+		this.success(result, this.connectionCallbackId);
+	}
+	
+	/**
+	 * Determine the type of connection
+	 * 
+	 * @param info the network info so we can determine connection type.
+	 * @return the type of mobile network we are on
+	 */
+	private String getType(NetworkInfo info) {
+		if (info != null) {
+			String type = info.getTypeName(); 
+
+            if (type.toLowerCase().equals(WIFI)) {
+                return TYPE_WIFI;
+            }
+            else if (type.toLowerCase().equals(MOBILE)) {
+				type = info.getSubtypeName();
+				if (type.toLowerCase().equals(GSM) || 
+						type.toLowerCase().equals(GPRS) ||
+						type.toLowerCase().equals(EDGE)) {
+					return TYPE_2G;
+				}
+				else if (type.toLowerCase().equals(CDMA) || 
+						type.toLowerCase().equals(UMTS)) {
+					return TYPE_3G;
+				}
+				else if (type.toLowerCase().equals(LTE) || 
+						type.toLowerCase().equals(UMB)) {
+					return TYPE_4G;
+				}
+			}
+		} 
+		else {
+			return TYPE_NONE;
+		}
+		return TYPE_UNKNOWN;
 	}
 }
--- a/framework/src/com/phonegap/Storage.java
+++ b/framework/src/com/phonegap/Storage.java
@@ -16,15 +16,21 @@ import android.database.Cursor;
 import android.database.sqlite.*;

 /**
- * This class implements the HTML5 database support for Android 1.X devices.  
- * It is not used for Android 2.X, since HTML5 database is built in to the browser.
+ * This class implements the HTML5 database support for Android 1.X devices. It
+ * is not used for Android 2.X, since HTML5 database is built in to the browser.
 */
 public class Storage extends Plugin {
+
+	// Data Definition Language
+	private static final String ALTER = "alter";
+	private static final String CREATE = "create";
+	private static final String DROP = "drop";
+	private static final String TRUNCATE = "truncate";
 	
-	SQLiteDatabase myDb = null;		// Database object
-	String path = null;				// Database path
-	String dbName = null;			// Database name
-	
+	SQLiteDatabase myDb = null; // Database object
+	String path = null; // Database path
+	String dbName = null; // Database name
+
 	/**
 	 * Constructor.
 	 */
@@ -34,29 +40,37 @@ public class Storage extends Plugin {
 	/**
 	 * Executes the request and returns PluginResult.
 	 * 
-	 * @param action 		The action to execute.
-	 * @param args 			JSONArry of arguments for the plugin.
-	 * @param callbackId	The callback id used when calling back into JavaScript.
-	 * @return 				A PluginResult object with a status and message.
+	 * @param action
+	 *            The action to execute.
+	 * @param args
+	 *            JSONArry of arguments for the plugin.
+	 * @param callbackId
+	 *            The callback id used when calling back into JavaScript.
+	 * @return A PluginResult object with a status and message.
 	 */
 	public PluginResult execute(String action, JSONArray args, String callbackId) {
 		PluginResult.Status status = PluginResult.Status.OK;
-		String result = "";		
-		
+		String result = "";
+
 		try {
-			// TODO: Do we want to allow a user to do this, since they could get to other app databases?
+			// TODO: Do we want to allow a user to do this, since they could get
+			// to other app databases?
 			if (action.equals("setStorage")) {
 				this.setStorage(args.getString(0));
-			}
-			else if (action.equals("openDatabase")) {
-				this.openDatabase(args.getString(0), args.getString(1), args.getString(2), args.getLong(3));
-			}
-			else if (action.equals("executeSql")) {
-				JSONArray a = args.getJSONArray(1);
-				int len = a.length();
-				String[] s = new String[len];
-				for (int i=0; i<len; i++) {
-					s[i] = a.getString(i);
+			} else if (action.equals("openDatabase")) {
+				this.openDatabase(args.getString(0), args.getString(1),
+						args.getString(2), args.getLong(3));
+			} else if (action.equals("executeSql")) {
+				String[] s = null;
+				if (args.isNull(1)) {
+					s = new String[0];
+				} else {
+					JSONArray a = args.getJSONArray(1);
+					int len = a.length();
+					s = new String[len];
+					for (int i = 0; i < len; i++) {
+						s[i] = a.getString(i);
+					}
 				}
 				this.executeSql(args.getString(0), s, args.getString(2));
 			}
@@ -67,15 +81,17 @@ public class Storage extends Plugin {
 	}

 	/**
-	 * Identifies if action to be executed returns a value and should be run synchronously.
+	 * Identifies if action to be executed returns a value and should be run
+	 * synchronously.
 	 * 
-	 * @param action	The action to execute
-	 * @return			T=returns value
+	 * @param action
+	 *            The action to execute
+	 * @return T=returns value
 	 */
 	public boolean isSynch(String action) {
-		return false;
+		return true;
 	}
-	
+
 	/**
 	 * Clean up and close database.
 	 */
@@ -87,33 +103,40 @@ public class Storage extends Plugin {
 		}
 	}

-    //--------------------------------------------------------------------------
-    // LOCAL METHODS
-    //--------------------------------------------------------------------------
+	// --------------------------------------------------------------------------
+	// LOCAL METHODS
+	// --------------------------------------------------------------------------

 	/**
-	 * Set the application package for the database.  Each application saves its 
-	 * database files in a directory with the application package as part of the file name.
+	 * Set the application package for the database. Each application saves its
+	 * database files in a directory with the application package as part of the
+	 * file name.
 	 * 
 	 * For example, application "com.phonegap.demo.Demo" would save its database
 	 * files in "/data/data/com.phonegap.demo/databases/" directory.
 	 * 
-	 * @param appPackage			The application package.
+	 * @param appPackage
+	 *            The application package.
 	 */
 	public void setStorage(String appPackage) {
 		this.path = "/data/data/" + appPackage + "/databases/";
 	}
-	
+
 	/**
 	 * Open database.
 	 * 
-	 * @param db					The name of the database
-	 * @param version				The version
-	 * @param display_name			The display name
-	 * @param size					The size in bytes
+	 * @param db
+	 *            The name of the database
+	 * @param version
+	 *            The version
+	 * @param display_name
+	 *            The display name
+	 * @param size
+	 *            The size in bytes
 	 */
-	public void openDatabase(String db, String version, String display_name, long size)	{
-		
+	public void openDatabase(String db, String version, String display_name,
+			long size) {
+
 		// If database is open, then close it
 		if (this.myDb != null) {
 			this.myDb.close();
@@ -121,27 +144,36 @@ public class Storage extends Plugin {

 		// If no database path, generate from application package
 		if (this.path == null) {
-	        Package pack = this.ctx.getClass().getPackage();
-	        String appPackage = pack.getName();
-	        this.setStorage(appPackage);
+			Package pack = this.ctx.getClass().getPackage();
+			String appPackage = pack.getName();
+			this.setStorage(appPackage);
 		}
-	        
+
 		this.dbName = this.path + db + ".db";
 		this.myDb = SQLiteDatabase.openOrCreateDatabase(this.dbName, null);
 	}
-	
+
 	/**
 	 * Execute SQL statement.
 	 * 
-	 * @param query				The SQL query
-	 * @param params			Parameters for the query
-	 * @param tx_id				Transaction id
+	 * @param query
+	 *            The SQL query
+	 * @param params
+	 *            Parameters for the query
+	 * @param tx_id
+	 *            Transaction id
 	 */
 	public void executeSql(String query, String[] params, String tx_id) {
 		try {
-			Cursor myCursor = this.myDb.rawQuery(query, params);
-			this.processResults(myCursor, tx_id);
-			myCursor.close();
+			if (isDDL(query)) {
+				this.myDb.execSQL(query);
+				this.sendJavascript("droiddb.completeQuery('" + tx_id + "', '');");
+			} 
+			else {
+				Cursor myCursor = this.myDb.rawQuery(query, params);
+				this.processResults(myCursor, tx_id);
+				myCursor.close();
+			}
 		} 
 		catch (SQLiteException ex) {
 			ex.printStackTrace();
@@ -151,24 +183,40 @@ public class Storage extends Plugin {
 			this.sendJavascript("droiddb.fail('" + ex.getMessage() + "','" + tx_id + "');");
 		}
 	}
-	
+
+	/**
+	 * Checks to see the the query is a Data Definintion command
+	 * 
+	 * @param query to be executed
+	 * @return true if it is a DDL command, false otherwise
+	 */
+	private boolean isDDL(String query) {
+		String cmd = query.toLowerCase();
+		if (cmd.startsWith(DROP) || cmd.startsWith(CREATE) || cmd.startsWith(ALTER) || cmd.startsWith(TRUNCATE)) {
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	 * Process query results.
 	 * 
-	 * @param cur				Cursor into query results
-	 * @param tx_id				Transaction id
+	 * @param cur
+	 *            Cursor into query results
+	 * @param tx_id
+	 *            Transaction id
 	 */
 	public void processResults(Cursor cur, String tx_id) {
-		
+
 		String result = "[]";
 		// If query result has rows
-		
+
 		if (cur.moveToFirst()) {
 			JSONArray fullresult = new JSONArray();
 			String key = "";
 			String value = "";
 			int colCount = cur.getColumnCount();
-			
+
 			// Build up JSON result object for each row
 			do {
 				JSONObject row = new JSONObject();
@@ -179,19 +227,20 @@ public class Storage extends Plugin {
 						row.put(key, value);
 					}
 					fullresult.put(row);
-					
+
 				} catch (JSONException e) {
 					e.printStackTrace();
 				}
-				
+
 			} while (cur.moveToNext());
-			
+
 			result = fullresult.toString();
 		}
-		
+
 		// Let JavaScript know that there are no more rows
-		this.sendJavascript("droiddb.completeQuery('" + tx_id + "', "+result+");");
-		
+		this.sendJavascript("droiddb.completeQuery('" + tx_id + "', " + result
+				+ ");");
+
 	}
-		
+
 }
--- a/framework/src/com/phonegap/api/IPlugin.java
+++ b/framework/src/com/phonegap/api/IPlugin.java
@@ -54,14 +54,23 @@ public interface IPlugin {

    /**
     * Called when the system is about to start resuming a previous activity. 
+     * 
+     * @param multitasking		Flag indicating if multitasking is turned on for app
     */
-    void onPause();
+    void onPause(boolean multitasking);

    /**
     * Called when the activity will start interacting with the user. 
+     * 
+     * @param multitasking		Flag indicating if multitasking is turned on for app
     */
-    void onResume();
+    void onResume(boolean multitasking);
    
+    /**
+     * Called when the activity receives a new intent. 
+     */
+    void onNewIntent(Intent intent);
+
    /**
     * The final call you receive before your activity is destroyed. 
     */
--- a/framework/src/com/phonegap/api/PhonegapActivity.java
+++ b/framework/src/com/phonegap/api/PhonegapActivity.java
@@ -15,7 +15,7 @@ import android.content.Intent;
 * It is used to isolate plugin development, and remove dependency on entire Phonegap library.
 */
 public abstract class PhonegapActivity extends Activity {
-		
+
    /**
     * Add a class that implements a service.
     * 
@@ -39,5 +39,12 @@ public abstract class PhonegapActivity extends Activity {
     * @param intent			The intent to start
     * @param requestCode		The request code that is passed to callback to identify the activity
     */
-    abstract public void startActivityForResult(Plugin command, Intent intent, int requestCode);
+    abstract public void startActivityForResult(IPlugin command, Intent intent, int requestCode);
+
+    /**
+     * Set the plugin to be called when a sub-activity exits.
+     * 
+     * @param plugin			The plugin on which onActivityResult is to be called
+     */
+    abstract public void setActivityResultCallback(IPlugin plugin);
 }
--- a/framework/src/com/phonegap/api/Plugin.java
+++ b/framework/src/com/phonegap/api/Plugin.java
@@ -8,6 +8,7 @@
 package com.phonegap.api;

 import org.json.JSONArray;
+import org.json.JSONObject;

 import android.content.Intent;
 import android.webkit.WebView;
@@ -19,6 +20,7 @@ import android.webkit.WebView;
 */
 public abstract class Plugin implements IPlugin {

+	public String id;
    public WebView webView;					// WebView object
    public PhonegapActivity ctx;			// PhonegapActivity object

@@ -64,14 +66,24 @@ public abstract class Plugin implements IPlugin {
 	
    /**
     * Called when the system is about to start resuming a previous activity. 
+     * 
+     * @param multitasking		Flag indicating if multitasking is turned on for app
     */
-    public void onPause() {
+    public void onPause(boolean multitasking) {
    }

    /**
     * Called when the activity will start interacting with the user. 
+     * 
+     * @param multitasking		Flag indicating if multitasking is turned on for app
     */
-    public void onResume() {
+    public void onResume(boolean multitasking) {
+    }
+    
+    /**
+     * Called when the activity receives a new intent. 
+     */
+    public void onNewIntent(Intent intent) {
    }
    
    /**
@@ -116,6 +128,26 @@ public abstract class Plugin implements IPlugin {
    	this.ctx.sendJavascript(pluginResult.toSuccessCallbackString(callbackId));
    }

+    /**
+     * Helper for success callbacks that just returns the Status.OK by default
+     * 
+     * @param message			The message to add to the success result.
+     * @param callbackId		The callback id used when calling back into JavaScript.
+     */
+    public void success(JSONObject message, String callbackId) {
+    	this.ctx.sendJavascript(new PluginResult(PluginResult.Status.OK, message).toSuccessCallbackString(callbackId));
+    }
+
+    /**
+     * Helper for success callbacks that just returns the Status.OK by default
+     * 
+     * @param message			The message to add to the success result.
+     * @param callbackId		The callback id used when calling back into JavaScript.
+     */
+    public void success(String message, String callbackId) {
+    	this.ctx.sendJavascript(new PluginResult(PluginResult.Status.OK, message).toSuccessCallbackString(callbackId));
+    }
+    
    /**
     * Call the JavaScript error callback for this plugin.
     * 
@@ -125,4 +157,24 @@ public abstract class Plugin implements IPlugin {
    public void error(PluginResult pluginResult, String callbackId) {
    	this.ctx.sendJavascript(pluginResult.toErrorCallbackString(callbackId));
    }
+
+    /**
+     * Helper for error callbacks that just returns the Status.ERROR by default
+     * 
+     * @param message			The message to add to the error result.
+     * @param callbackId		The callback id used when calling back into JavaScript.
+     */
+    public void error(JSONObject message, String callbackId) {
+    	this.ctx.sendJavascript(new PluginResult(PluginResult.Status.ERROR, message).toErrorCallbackString(callbackId));
+    }
+
+    /**
+     * Helper for error callbacks that just returns the Status.ERROR by default
+     * 
+     * @param message			The message to add to the error result.
+     * @param callbackId		The callback id used when calling back into JavaScript.
+     */
+    public void error(String message, String callbackId) {
+    	this.ctx.sendJavascript(new PluginResult(PluginResult.Status.ERROR, message).toErrorCallbackString(callbackId));
+    }
 }
--- a/framework/src/com/phonegap/api/PluginManager.java
+++ b/framework/src/com/phonegap/api/PluginManager.java
@@ -7,12 +7,16 @@
 */
 package com.phonegap.api;

+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map.Entry;

 import org.json.JSONArray;
 import org.json.JSONException;
+import org.xmlpull.v1.XmlPullParserException;

+import android.content.Intent;
+import android.content.res.XmlResourceParser;
 import android.webkit.WebView;

 /**
@@ -23,7 +27,7 @@ import android.webkit.WebView;
 */
 public final class PluginManager {	

-	private HashMap<String, Plugin> plugins = new HashMap<String,Plugin>();
+	private HashMap<String, IPlugin> plugins = new HashMap<String,IPlugin>();
 	private HashMap<String, String> services = new HashMap<String,String>();
 	
 	private final PhonegapActivity ctx;
@@ -38,6 +42,35 @@ public final class PluginManager {
 	public PluginManager(WebView app, PhonegapActivity ctx) {
 		this.ctx = ctx;
 		this.app = app;
+		this.loadPlugins();
+	}
+	
+	/**
+	 * Load plugins from res/xml/plugins.xml
+	 */
+	public void loadPlugins() {
+		int id = ctx.getResources().getIdentifier("plugins", "xml", ctx.getPackageName());
+		if (id == 0) { pluginConfigurationMissing(); }
+		XmlResourceParser xml = ctx.getResources().getXml(id);
+		int eventType = -1;
+		while (eventType != XmlResourceParser.END_DOCUMENT) {
+			if (eventType == XmlResourceParser.START_TAG) {
+				String strNode = xml.getName();
+				if (strNode.equals("plugin")) {
+					String name = xml.getAttributeValue(null, "name");
+					String value = xml.getAttributeValue(null, "value");
+					//System.out.println("Plugin: "+name+" => "+value);
+					this.addService(name, value);
+				}
+			}
+			try {
+				eventType = xml.next();
+			} catch (XmlPullParserException e) {
+				e.printStackTrace();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
 	}

 	/**
@@ -74,7 +107,7 @@ public final class PluginManager {
 				c = getClassByName(clazz);
 			}
 			if (isPhoneGapPlugin(c)) {
-				final Plugin plugin = this.addPlugin(clazz, c); 
+				final IPlugin plugin = this.addPlugin(clazz, c); 
 				final PhonegapActivity ctx = this.ctx;
 				runAsync = async && !plugin.isSynch(action);
 				if (runAsync) {
@@ -100,7 +133,7 @@ public final class PluginManager {
 									ctx.sendJavascript(cr.toErrorCallbackString(callbackId));
 								}
 							} catch (Exception e) {
-								PluginResult cr = new PluginResult(PluginResult.Status.ERROR);
+								PluginResult cr = new PluginResult(PluginResult.Status.ERROR, e.getMessage());
 								ctx.sendJavascript(cr.toErrorCallbackString(callbackId));
 							}
 						}
@@ -159,24 +192,7 @@ public final class PluginManager {
 		}
 		return false;
 	}
-	
-    /**
-     * Add plugin to be loaded and cached.  This creates an instance of the plugin.
-     * If plugin is already created, then just return it.
-     * 
-     * @param className				The class to load
-     * @return						The plugin
-     */
-	public Plugin addPlugin(String className) {
-	    try {
-            return this.addPlugin(className, this.getClassByName(className)); 
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-            System.out.println("Error adding plugin "+className+".");
-        }
-        return null;
-	}
-	
+
    /**
     * Add plugin to be loaded and cached.  This creates an instance of the plugin.
     * If plugin is already created, then just return it.
@@ -187,12 +203,12 @@ public final class PluginManager {
     * @return						The plugin
     */
 	@SuppressWarnings("unchecked")
-	private Plugin addPlugin(String className, Class clazz) { 
+	private IPlugin addPlugin(String className, Class clazz) { 
    	if (this.plugins.containsKey(className)) {
    		return this.getPlugin(className);
    	}
    	try {
-              Plugin plugin = (Plugin)clazz.newInstance();
+              IPlugin plugin = (IPlugin)clazz.newInstance();
              this.plugins.put(className, plugin);
              plugin.setContext(this.ctx);
              plugin.setView(this.app);
@@ -211,8 +227,8 @@ public final class PluginManager {
     * @param className				The class of the loaded plugin.
     * @return
     */
-    private Plugin getPlugin(String className) {
-    	Plugin plugin = this.plugins.get(className);
+    private IPlugin getPlugin(String className) {
+    	IPlugin plugin = this.plugins.get(className);
    	return plugin;
    }
    
@@ -229,27 +245,31 @@ public final class PluginManager {

    /**
     * Called when the system is about to start resuming a previous activity. 
+     * 
+     * @param multitasking		Flag indicating if multitasking is turned on for app
     */
-    public void onPause() {
-    	java.util.Set<Entry<String,Plugin>> s = this.plugins.entrySet();
-    	java.util.Iterator<Entry<String,Plugin>> it = s.iterator();
+    public void onPause(boolean multitasking) {
+    	java.util.Set<Entry<String,IPlugin>> s = this.plugins.entrySet();
+    	java.util.Iterator<Entry<String,IPlugin>> it = s.iterator();
    	while(it.hasNext()) {
-    		Entry<String,Plugin> entry = it.next();
-    		Plugin plugin = entry.getValue();
-    		plugin.onPause();
+    		Entry<String,IPlugin> entry = it.next();
+    		IPlugin plugin = entry.getValue();
+    		plugin.onPause(multitasking);
    	}
    }
    
    /**
     * Called when the activity will start interacting with the user. 
+     * 
+     * @param multitasking		Flag indicating if multitasking is turned on for app
     */
-    public void onResume() {
-    	java.util.Set<Entry<String,Plugin>> s = this.plugins.entrySet();
-    	java.util.Iterator<Entry<String,Plugin>> it = s.iterator();
+    public void onResume(boolean multitasking) {
+    	java.util.Set<Entry<String,IPlugin>> s = this.plugins.entrySet();
+    	java.util.Iterator<Entry<String,IPlugin>> it = s.iterator();
    	while(it.hasNext()) {
-    		Entry<String,Plugin> entry = it.next();
-    		Plugin plugin = entry.getValue();
-    		plugin.onResume();
+    		Entry<String,IPlugin> entry = it.next();
+    		IPlugin plugin = entry.getValue();
+    		plugin.onResume(multitasking);
    	}    	
    }

@@ -257,12 +277,32 @@ public final class PluginManager {
     * The final call you receive before your activity is destroyed. 
     */
    public void onDestroy() {
-    	java.util.Set<Entry<String,Plugin>> s = this.plugins.entrySet();
-    	java.util.Iterator<Entry<String,Plugin>> it = s.iterator();
+    	java.util.Set<Entry<String,IPlugin>> s = this.plugins.entrySet();
+    	java.util.Iterator<Entry<String,IPlugin>> it = s.iterator();
    	while(it.hasNext()) {
-    		Entry<String,Plugin> entry = it.next();
-    		Plugin plugin = entry.getValue();
+    		Entry<String,IPlugin> entry = it.next();
+    		IPlugin plugin = entry.getValue();
    		plugin.onDestroy();
    	}
    }
+    
+    /**
+     * Called when the activity receives a new intent. 
+     */    
+    public void onNewIntent(Intent intent) {
+    	java.util.Set<Entry<String,IPlugin>> s = this.plugins.entrySet();
+    	java.util.Iterator<Entry<String,IPlugin>> it = s.iterator();
+    	while(it.hasNext()) {
+    		Entry<String,IPlugin> entry = it.next();
+    		IPlugin plugin = entry.getValue();
+    		plugin.onNewIntent(intent);
+    	}
+    }
+
+	private void pluginConfigurationMissing() {
+		System.err.println("=====================================================================================");
+		System.err.println("ERROR: plugin.xml is missing.  Add res/xml/plugins.xml to your project.");      
+		System.err.println("https://raw.github.com/phonegap/phonegap-android/master/framework/res/xml/plugins.xml");        
+		System.err.println("=====================================================================================");
+	}
 }
--- a/framework/src/com/phonegap/api/PluginResult.java
+++ b/framework/src/com/phonegap/api/PluginResult.java
@@ -10,6 +10,8 @@ package com.phonegap.api;
 import org.json.JSONArray;
 import org.json.JSONObject;

+import android.util.Log;
+
 public class PluginResult {
 	private final int status;
 	private final String message;
@@ -32,6 +34,12 @@ public class PluginResult {
 		this.cast = cast;
 	}

+	public PluginResult(Status status, JSONObject message, String cast) {
+		this.status = status.ordinal();
+		this.message = message.toString();
+		this.cast = cast;
+	}
+
 	public PluginResult(Status status, JSONArray message) {
 		this.status = status.ordinal();
 		this.message = message.toString();
--- a/framework/src/com/phonegap/file/EncodingException.java
+++ b/framework/src/com/phonegap/file/EncodingException.java
@@ -0,0 +1,9 @@
+package com.phonegap.file;
+
+public class EncodingException extends Exception {
+
+	public EncodingException(String message) {
+		super(message);
+	}
+	
+}
--- a/framework/src/com/phonegap/file/FileExistsException.java
+++ b/framework/src/com/phonegap/file/FileExistsException.java
@@ -0,0 +1,9 @@
+package com.phonegap.file;
+
+public class FileExistsException extends Exception {
+
+	public FileExistsException(String msg) {
+		super(msg);
+	}
+
+}
--- a/framework/src/com/phonegap/file/InvalidModificationException.java
+++ b/framework/src/com/phonegap/file/InvalidModificationException.java
@@ -0,0 +1,9 @@
+package com.phonegap.file;
+
+public class InvalidModificationException extends Exception {
+
+	public InvalidModificationException(String message) {
+		super(message);
+	}
+
+}
--- a/framework/src/com/phonegap/file/NoModificationAllowedException.java
+++ b/framework/src/com/phonegap/file/NoModificationAllowedException.java
@@ -0,0 +1,9 @@
+package com.phonegap.file;
+
+public class NoModificationAllowedException extends Exception {
+
+	public NoModificationAllowedException(String message) {
+		super(message);
+	}
+
+}
--- a/framework/src/com/phonegap/file/TypeMismatchException.java
+++ b/framework/src/com/phonegap/file/TypeMismatchException.java
@@ -0,0 +1,9 @@
+package com.phonegap.file;
+
+public class TypeMismatchException extends Exception {
+
+	public TypeMismatchException(String message) {
+		super(message);
+	}
+
+}
--- a/lib/classic.rb
+++ b/lib/classic.rb
@@ -5,7 +5,7 @@ class Classic
    @android_sdk_path, @name, @pkg, @www, @path = a
    build
  end
-  
+
  def build
    setup
    clobber
@@ -16,23 +16,29 @@ class Classic
    copy_libs
    add_name_to_strings
    write_java
-  end 
-  
+  end
+
  def setup
-    @android_dir    = File.expand_path(File.dirname(__FILE__).gsub('lib',''))
+    @android_dir    = File.expand_path(File.dirname(__FILE__).gsub(/lib$/,''))
    @framework_dir  = File.join(@android_dir, "framework")
-    @icon           = File.join(@www, 'icon.png')
+    @icon           = File.join(@www, 'icon.png') unless !@icon.nil? && File.exists?(@icon)
+    # Hash that stores the location of icons for each resolution type. Uses the default icon for all resolutions as a baseline.
+    @icons          = {
+      :"drawable-ldpi" => @icon,
+      :"drawable-mdpi" => @icon,
+      :"drawable-hdpi" => @icon
+    } if @icons.nil?
    @app_js_dir     = ''
    @content        = 'index.html'
  end
-  
+
  # replaces @path with new android project
  def clobber
    FileUtils.rm_r(@path) if File.exists? @path
    FileUtils.mkdir_p @path
  end
-  
-  # removes local.properties and recreates based on android_sdk_path 
+
+  # removes local.properties and recreates based on android_sdk_path
  # then generates framework/phonegap.jar
  def build_jar
    %w(local.properties phonegap.js phonegap.jar).each do |f|
@@ -40,7 +46,7 @@ class Classic
    end
    open(File.join(@framework_dir, "local.properties"), 'w') do |f|
      f.puts "sdk.dir=#{ @android_sdk_path }"
-    end 
+    end
    Dir.chdir(@framework_dir)
    `ant jar`
    Dir.chdir(@android_dir)
@@ -49,9 +55,9 @@ class Classic
  # runs android create project
  # TODO need to allow more flexible SDK targetting via config.xml
  def create_android
-    IO.popen("android list targets") { |f| 
+    IO.popen("android list targets") { |f|
      targets = f.readlines(nil)[0].scan(/id\:.*$/)
-      if (targets.length > 0) 
+      if (targets.length > 0)
        target_id = targets.last.match(/\d+/).to_a.first
        `android create project -t #{ target_id } -k #{ @pkg } -a #{ @name } -n #{ @name } -p #{ @path }`
      else
@@ -60,7 +66,7 @@ class Classic
      end
    }
  end
-  
+
  # copies the project/www folder into tmp/android/www
  def include_www
    FileUtils.mkdir_p File.join(@path, "assets", "www")
@@ -82,25 +88,37 @@ class Classic

  # copies stuff from src directory into the android project directory (@path)
  def copy_libs
+    version = IO.read(File.join(@framework_dir, '../VERSION')).lstrip.rstrip
    framework_res_dir = File.join(@framework_dir, "res")
    app_res_dir = File.join(@path, "res")
    # copies in the jar
    FileUtils.mkdir_p File.join(@path, "libs")
-    FileUtils.cp File.join(@framework_dir, "phonegap.jar"), File.join(@path, "libs")
+    FileUtils.cp File.join(@framework_dir, "phonegap-#{ version }.jar"), File.join(@path, "libs")
    # copies in the strings.xml
    FileUtils.mkdir_p File.join(app_res_dir, "values")
    FileUtils.cp File.join(framework_res_dir, "values","strings.xml"), File.join(app_res_dir, "values", "strings.xml")
+    # copies in plugins.xml
+    FileUtils.mkdir_p File.join(app_res_dir, "xml")
+    FileUtils.cp File.join(framework_res_dir, "xml","plugins.xml"), File.join(app_res_dir, "xml", "plugins.xml")
    # drops in the layout files: main.xml and preview.xml
    FileUtils.mkdir_p File.join(app_res_dir, "layout")
    %w(main.xml).each do |f|
      FileUtils.cp File.join(framework_res_dir, "layout", f), File.join(app_res_dir, "layout", f)
    end
    # icon file copy
-    # if it is not in the www directory use the default one in the src dir
-    @icon = File.join(framework_res_dir, "drawable", "icon.png") unless File.exists?(@icon)
    %w(drawable-hdpi drawable-ldpi drawable-mdpi).each do |e|
+      # if specific resolution icons are specified, use those. if not, see if a general purpose icon was defined.
+      # finally, fall back to using the default PhoneGap one.
+      currentIcon = ""
+      if !@icons[e.to_sym].nil? && File.exists?(File.join(@www, @icons[e.to_sym]))
+        currentIcon = File.join(@www, @icons[e.to_sym])
+      elsif File.exists?(@icon)
+        currentIcon = @icon
+      else
+        currentIcon = File.join(framework_res_dir, "drawable", "icon.png")
+      end
      FileUtils.mkdir_p(File.join(app_res_dir, e))
-      FileUtils.cp(@icon, File.join(app_res_dir, e, "icon.png"))
+      FileUtils.cp(currentIcon, File.join(app_res_dir, e, "icon.png"))
    end
    # concat JS and put into www folder. this can be overridden in the config.xml via @app_js_dir
    js_dir = File.join(@framework_dir, "assets", "js")
@@ -110,9 +128,9 @@ class Classic
      phonegapjs << IO.read(File.join(js_dir, script))
      phonegapjs << "\n\n"
    end
-    File.open(File.join(@path, "assets", "www", @app_js_dir, "phonegap.js"), 'w') {|f| f.write(phonegapjs) }
+    File.open(File.join(@path, "assets", "www", @app_js_dir, "phonegap-#{ version }.js"), 'w') {|f| f.write(phonegapjs) }
  end
-  
+
  # puts app name in strings
  def add_name_to_strings
    x = "<?xml version=\"1.0\" encoding=\"utf-8\"?>
@@ -123,8 +141,8 @@ class Classic
    "
    open(File.join(@path, "res", "values", "strings.xml"), 'w') do |f|
      f.puts x.gsub('    ','')
-    end 
-  end 
+    end
+  end

  # create java source file
  def write_java
@@ -149,7 +167,7 @@ class Classic
    FileUtils.mkdir_p(code_dir)
    open(File.join(code_dir, "#{ @name }.java"),'w') { |f| f.puts j }
  end
-  
+
  # friendly output for now
  def msg
    puts "Created #{ @path }"
--- a/lib/create.rb
+++ b/lib/create.rb
@@ -1,5 +1,5 @@
 # Create
-# 
+#
 # Generates an Android project from a valid WWW directory and puts it in ../[PROJECT NAME]_android
 #
 class Create < Classic
@@ -8,65 +8,90 @@ class Create < Classic
    read_config
    build
  end
-  
+
  def guess_paths(path)
    # if no path is supplied uses current directory for project
    path = FileUtils.pwd if path.nil?
-    
+
    # if a www is found use it for the project
    path = File.join(path, 'www') if File.exists? File.join(path, 'www')
-    
+
    # defaults
    @name             = path.split("/").last.gsub('-','').gsub(' ','') # no dashses nor spaces
    @path             = File.join(path, '..', "#{ @name }_android")
-    @www              = path 
-    @pkg              = "com.phonegap.#{ @name }" 
+    @www              = path
+    @pkg              = "com.phonegap.#{ @name }"
    @android_sdk_path = Dir.getwd[0,1] != "/" ? `android-sdk-path.bat android.bat`.gsub('\\tools','').gsub('\\', '\\\\\\\\') : `which android`.gsub(/\/tools\/android$/,'').chomp
    @android_dir      = File.expand_path(File.dirname(__FILE__).gsub('lib',''))
    @framework_dir    = File.join(@android_dir, "framework")
    @icon             = File.join(@www, 'icon.png')
    @app_js_dir       = ''
    @content          = 'index.html'
-    
+
    # stop executation on errors
-    raise 'Expected index.html in the following folder #{ path }.\nThe path is expected to be the directory droidgap create is run from or specified as a command line arg like droidgap create my_path.' unless File.exists? File.join(path, 'index.html')    
+    raise "Expected index.html in the following folder #{ path }.\nThe path is expected to be the directory droidgap create is run from or specified as a command line arg like droidgap create my_path." unless File.exists? File.join(path, 'index.html')
    raise 'Could not find android in your PATH!' if @android_sdk_path.empty?
  end

  # reads in a config.xml file
  def read_config
    config_file = File.join(@www, 'config.xml')
-    
+
    if File.exists?(config_file)
      require 'rexml/document'
      f                 = File.new config_file
-      doc               = REXML::Document.new(f)  
-      @config           = {}  
+      doc               = REXML::Document.new(f)
+      @config           = {}
      @config[:id]      = doc.root.attributes["id"]
      @config[:version] = doc.root.attributes["version"]
-      
+      @config[:icons]   = {}
+      defaultIconSize   = 0
      doc.root.elements.each do |n|
-        @config[:name]        = n.text.gsub('-','').gsub(' ','') if n.name == 'name'
-        @config[:description] = n.text if n.name == 'description'
-        @config[:icon]        = n.attributes["src"] if n.name == 'icon'
-        @config[:content]     = n.attributes["src"] if n.name == 'content'  
-        
+        @config[:name]             = n.text.gsub('-','').gsub(' ','') if n.name == 'name'
+        @config[:description]      = n.text if n.name == 'description'
+        @config[:content]          = n.attributes["src"] if n.name == 'content'
+        if n.name == 'icon'
+          if n.attributes["width"] == '72' && n.attributes["height"] == '72'
+            @config[:icons]["drawable-hdpi".to_sym] = n.attributes["src"]
+            if 72 > defaultIconSize
+              @config[:icon] = n.attributes["src"]
+              defaultIconSize = 72
+            end
+          elsif n.attributes["width"] == '48' && n.attributes["height"] == '48'
+            @config[:icons]["drawable-mdpi".to_sym] = n.attributes["src"]
+            if 48 > defaultIconSize
+              @config[:icon] = n.attributes["src"]
+              defaultIconSize = 48
+            end
+          elsif n.attributes["width"] == '36' && n.attributes["height"] == '36'
+            @config[:icons]["drawable-ldpi".to_sym] = n.attributes["src"]
+            if 36 > defaultIconSize
+              @config[:icon] = n.attributes["src"]
+              defaultIconSize = 36
+            end
+          else
+            @config[:icon] = n.attributes["src"]
+          end
+        end
+
+
        if n.name == "preference" && n.attributes["name"] == 'javascript_folder'
          @config[:js_dir] = n.attributes["value"]
-        end 
-      end 
-      
+        end
+      end
+
      # extract android specific stuff
      @config[:versionCode] = doc.elements["//android:versionCode"] ? doc.elements["//android:versionCode"].text : 3
      @config[:minSdkVersion] = doc.elements["//android:minSdkVersion"] ? doc.elements["//android:minSdkVersion"].text : 1
      # will change the name from the directory to the name element text
      @name = @config[:name] if @config[:name]
      # set the icon from the config
-      @icon = File.join(@www, @config[:icon])
+      @icon = File.join(@www, @config[:icon]) if @config[:icon]
+      @icons = @config[:icons] if @config[:icons].length > 0
      # sets the app js dir where phonegap.js gets copied
      @app_js_dir = @config[:js_dir] ? @config[:js_dir] : ''
      # sets the start page
      @content = @config[:content] ? @config[:content] : 'index.html'
-    end     
-  end 
+    end
+  end
 end
--- a/lib/update.rb
+++ b/lib/update.rb
@@ -33,12 +33,19 @@ class Update
  # TODO need to allow for www import inc icon
  def copy_libs
    puts "Copying over libraries and assets..."
-    
-    FileUtils.mkdir_p File.join(@path, "libs")
-    FileUtils.cp File.join(@framework_dir, "phonegap.jar"), File.join(@path, "libs")
+    version = IO.read(File.join(@framework_dir, '../VERSION'))

-    FileUtils.mkdir_p File.join(@path, "assets", "www")
-    FileUtils.cp File.join(@framework_dir, "assets", "www", "phonegap.js"), File.join(@path, "assets", "www")
+    FileUtils.cp File.join(@framework_dir, "phonegap-#{ version }.jar"), File.join(@path, "libs")
+
+    # concat JS and put into www folder. this can be overridden in the config.xml via @app_js_dir
+    js_dir = File.join(@framework_dir, "assets", "js")
+    phonegapjs = IO.read(File.join(js_dir, 'phonegap.js.base'))
+    Dir.new(js_dir).entries.each do |script|
+      next if script[0].chr == "." or script == "phonegap.js.base"
+      phonegapjs << IO.read(File.join(js_dir, script))
+      phonegapjs << "\n\n"
+    end
+    File.open(File.join(@path, "assets", "www", "phonegap-#{ version }.js"), 'w') {|f| f.write(phonegapjs) }
  end
  #
 end
--- a/util/yuicompressor/LICENSE
+++ b/util/yuicompressor/LICENSE
@@ -1,31 +0,0 @@
-YUI is issued by Yahoo! under the BSD License below.  
-
-Copyright (c) 2010, Yahoo! Inc.
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms, with or 
-without modification, are permitted provided that the following conditions 
-are met:
-
-    * Redistributions of source code must retain the above copyright notice, 
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of Yahoo! Inc. nor the names of its contributors may be 
-      used to endorse or promote products derived from this software without 
-      specific prior written permission of Yahoo! Inc.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-http://developer.yahoo.com/yui/license.html
-
--- a/util/yuicompressor/README
+++ b/util/yuicompressor/README
@@ -1,140 +0,0 @@
-==============================================================================
-YUI Compressor
-==============================================================================
-
-NAME
-
-  YUI Compressor - The Yahoo! JavaScript and CSS Compressor
-
-SYNOPSIS
-
-  Usage: java -jar yuicompressor-x.y.z.jar [options] [input file]
-
-  Global Options
-    -h, --help                Displays this information
-    --type <js|css>           Specifies the type of the input file
-    --charset <charset>       Read the input file using <charset>
-    --line-break <column>     Insert a line break after the specified column number
-    -v, --verbose             Display informational messages and warnings
-    -o <file>                 Place the output into <file>. Defaults to stdout.
-
-  JavaScript Options
-    --nomunge                 Minify only, do not obfuscate
-    --preserve-semi           Preserve all semicolons
-    --disable-optimizations   Disable all micro optimizations
-
-DESCRIPTION
-
-  The YUI Compressor is a JavaScript compressor which, in addition to removing
-  comments and white-spaces, obfuscates local variables using the smallest
-  possible variable name. This obfuscation is safe, even when using constructs
-  such as 'eval' or 'with' (although the compression is not optimal is those
-  cases) Compared to jsmin, the average savings is around 20%.
-
-  The YUI Compressor is also able to safely compress CSS files. The decision
-  on which compressor is being used is made on the file extension (js or css)
-
-GLOBAL OPTIONS
-
-  -h, --help
-      Prints help on how to use the YUI Compressor
-
-  --line-break
-      Some source control tools don't like files containing lines longer than,
-      say 8000 characters. The linebreak option is used in that case to split
-      long lines after a specific column. It can also be used to make the code
-      more readable, easier to debug (especially with the MS Script Debugger)
-      Specify 0 to get a line break after each semi-colon in JavaScript, and
-      after each rule in CSS.
-
-  --type js|css
-      The type of compressor (JavaScript or CSS) is chosen based on the
-      extension of the input file name (.js or .css) This option is required
-      if no input file has been specified. Otherwise, this option is only
-      required if the input file extension is neither 'js' nor 'css'.
-
-  --charset character-set
-      If a supported character set is specified, the YUI Compressor will use it
-      to read the input file. Otherwise, it will assume that the platform's
-      default character set is being used. The output file is encoded using
-      the same character set.
-
-  -o outfile
-      Place output in file outfile. If not specified, the YUI Compressor will
-      default to the standard output, which you can redirect to a file.
-
-  -v, --verbose
-      Display informational messages and warnings.
-
-JAVASCRIPT ONLY OPTIONS
-
-  --nomunge
-      Minify only. Do not obfuscate local symbols.
-
-  --preserve-semi
-      Preserve unnecessary semicolons (such as right before a '}') This option
-      is useful when compressed code has to be run through JSLint (which is the
-      case of YUI for example)
-
-  --disable-optimizations
-      Disable all the built-in micro optimizations.
-
-NOTES
-
-  + If no input file is specified, it defaults to stdin.
-
-  + The YUI Compressor requires Java version >= 1.4.
-
-  + It is possible to prevent a local variable, nested function or function
-    argument from being obfuscated by using "hints". A hint is a string that
-    is located at the very beginning of a function body like so:
-
-    function fn (arg1, arg2, arg3) {
-        "arg2:nomunge, localVar:nomunge, nestedFn:nomunge";
-
-        ...
-        var localVar;
-        ...
-
-        function nestedFn () {
-            ....
-        }
-
-        ...
-    }
-
-    The hint itself disappears from the compressed file.
-
-  + C-style comments starting with /*! are preserved. This is useful with
-    comments containing copyright/license information. For example:
-
-    /*!
-     * TERMS OF USE - EASING EQUATIONS
-     * Open source under the BSD License.
-     * Copyright 2001 Robert Penner All rights reserved.
-     */
-
-    becomes:
-
-    /*
-     * TERMS OF USE - EASING EQUATIONS
-     * Open source under the BSD License.
-     * Copyright 2001 Robert Penner All rights reserved.
-     */
-
-AUTHOR
-
-  The YUI Compressor was written and is maintained by:
-      Julien Lecomte <jlecomte@yahoo-inc.com>
-  The CSS portion is a port of Isaac Schlueter's cssmin utility.
-
-COPYRIGHT
-
-  Copyright (c) 2007-2009, Yahoo! Inc. All rights reserved.
-
-LICENSE
-
-  All code specific to YUI Compressor is issued under a BSD license.
-  YUI Compressor extends and implements code from Mozilla's Rhino project.
-  Rhino is issued under the Mozilla Public License (MPL), and MPL applies
-  to the Rhino source and binaries that are distributed with YUI Compressor.
--- a/util/yuicompressor/yuicompressor-2.4.2.jar
+++ b/util/yuicompressor/yuicompressor-2.4.2.jar