From 49de553ee879c3032e58e947b8684daba69f0812 Mon Sep 17 00:00:00 2001
From: Dave Johnson <davejohnson@dave-johnsons-macbook-pro.local>
Date: Fri, 30 Jul 2010 12:23:55 -0700
Subject: [PATCH] refactored the Command stuff a bit more, added a spashscreen

---
 framework/assets/js/cache.js                  |  18 ---
 framework/assets/js/phonegap.js.base          |  26 +++-
 framework/assets/js/splashscreen.js           |   5 +
 framework/build.xml                           |  42 +++++-
 framework/gen/com/phonegap/R.java             |   4 +-
 framework/res/drawable/splash.png             | Bin 0 -> 2990 bytes
 framework/res/layout/preview.xml              |  23 ----
 framework/src/com/phonegap/DroidGap.java      | 130 ++++++++++--------
 framework/src/com/phonegap/SplashScreen.java  |  15 ++
 framework/src/com/phonegap/api/Command.java   |  43 ++++--
 .../src/com/phonegap/api/CommandManager.java  | 123 ++++++++++++-----
 .../src/com/phonegap/api/CommandResult.java   |  11 +-
 .../src/com/phonegap/api/impl/Cache.java      | 109 ---------------
 13 files changed, 277 insertions(+), 272 deletions(-)
 delete mode 100644 framework/assets/js/cache.js
 create mode 100644 framework/assets/js/splashscreen.js
 create mode 100755 framework/res/drawable/splash.png
 delete mode 100644 framework/res/layout/preview.xml
 create mode 100644 framework/src/com/phonegap/SplashScreen.java
 delete mode 100644 framework/src/com/phonegap/api/impl/Cache.java

diff --git a/framework/assets/js/cache.js b/framework/assets/js/cache.js
deleted file mode 100644
index 28d55ce2..00000000
--- a/framework/assets/js/cache.js
+++ /dev/null
@@ -1,18 +0,0 @@
-PhoneGap.addPlugin = function(name, obj) {
-	if ( !window.plugins ) {
-		window.plugins = {};
-	}
-
-	if ( !window.plugins[name] ) {
-		window.plugins[name] = obj;
-	}
-}
-
-function Cache() {
-}
-
-Cache.prototype.getCachedPathForURI = function(uri, success, fail) {
-	PhoneGap.execAsync(success, fail, 'com.phonegap.api.impl.Cache', 'getCachedPathForURI', [uri]);
-};
-
-PhoneGap.addPlugin('cache', new Cache());
\ No newline at end of file
diff --git a/framework/assets/js/phonegap.js.base b/framework/assets/js/phonegap.js.base
index 0e24a82a..237a19ee 100755
--- a/framework/assets/js/phonegap.js.base
+++ b/framework/assets/js/phonegap.js.base
@@ -136,6 +136,19 @@ PhoneGap.addConstructor = function(func) {
     });
 };
 
+/**
+ * Adds a plugin object to window.plugins
+ */
+PhoneGap.addPlugin = function(name, obj) {
+	if ( !window.plugins ) {
+		window.plugins = {};
+	}
+
+	if ( !window.plugins[name] ) {
+		window.plugins[name] = obj;
+	}
+}
+
 /**
  * onDOMContentLoaded channel is fired when the DOM content 
  * of the page has been parsed.
@@ -216,23 +229,22 @@ PhoneGap.callbacks = {};
  * @param {String[]} [args] Zero or more arguments to pass to the method
  */
 PhoneGap.exec = function(clazz, action, args) {
-	CommandManager.exec(clazz, action, callbackId, args.join('__PHONEGAP__'), false);
+	CommandManager.exec(clazz, action, callbackId, JSON.stringify(args), false);
 };
 
 PhoneGap.execAsync = function(success, fail, clazz, action, args) {
 	var callbackId = clazz + PhoneGap.callbackId++;
 	PhoneGap.callbacks[callbackId] = {success:success, fail:fail};
-	CommandManager.exec(clazz, action, callbackId, args.join('__PHONEGAP__'), true);
-	return callbackId;
+	return CommandManager.exec(clazz, action, callbackId, JSON.stringify(args), true);
 };
 
 PhoneGap.callbackSuccess = function(callbackId, args) {
-	PhoneGap.callbacks[callbackId].success.apply(this, JSON.parse(args));
+	PhoneGap.callbacks[callbackId].success(args);
 	delete PhoneGap.callbacks[callbackId];
 };
 
-PhoneGap.callbackFailure = function(callbackId, args) {
-	PhoneGap.callbacks[callbackId].fail.apply(this, JSON.parse(args));
+PhoneGap.callbackError = function(callbackId, args) {
+	PhoneGap.callbacks[callbackId].fail(args);
 	delete PhoneGap.callbacks[callbackId];
 };
 
@@ -353,7 +365,7 @@ PhoneGap.UUIDcreatePart = function(length) {
 };
 
 PhoneGap.close = function(context, func, params) {
-    if (null == params) {
+    if (typeof params === 'undefined') {
         return function() {
             return func.apply(context, arguments);
         }
diff --git a/framework/assets/js/splashscreen.js b/framework/assets/js/splashscreen.js
new file mode 100644
index 00000000..cf27f765
--- /dev/null
+++ b/framework/assets/js/splashscreen.js
@@ -0,0 +1,5 @@
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.splashScreen == "undefined") {
+    	navigator.splashScreen = SplashScreen;  // SplashScreen object come from native side through addJavaScriptInterface
+    }
+});
\ No newline at end of file
diff --git a/framework/build.xml b/framework/build.xml
index ce0af6a5..285c1908 100644
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -64,21 +64,53 @@
     -->
     <setup />
 
-    <target name="move_files">
-      <concat destfile="../example/phonegap.js">
+	<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>
+
+		<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>
+
+    <target name="build-javascript">
+	  <delete file="assets/www/phonegap.js"/>
+      <concat destfile="assets/www/phonegap.js">
         <fileset dir="assets/js" includes="phonegap.js.base" />
         <fileset dir="assets/js" includes="*.js" />
       </concat>
     </target>
 
-    <target name="jar" depends="move_files, compile">
+    <target name="jar" depends="build-javascript, compile">
       <jar jarfile="phonegap.jar" basedir="bin/classes" excludes="**/R*.class" />
     </target>
 
-    <target name="phonegap_debug" depends="move_files, debug">
+    <target name="phonegap_debug" depends="build-javascript, debug">
     </target>
 
-    <target name="phonegap_release" depends="move_files, release">
+    <target name="phonegap_release" depends="build-javascript, release">
     </target>
 
 
diff --git a/framework/gen/com/phonegap/R.java b/framework/gen/com/phonegap/R.java
index 81a21810..7db0ceb3 100644
--- a/framework/gen/com/phonegap/R.java
+++ b/framework/gen/com/phonegap/R.java
@@ -12,15 +12,13 @@ public final class R {
     }
     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 int go=0x7f050002;
-        public static final int surface=0x7f050001;
     }
     public static final class layout {
         public static final int main=0x7f030000;
-        public static final int preview=0x7f030001;
     }
     public static final class string {
         public static final int app_name=0x7f040000;
diff --git a/framework/res/drawable/splash.png b/framework/res/drawable/splash.png
new file mode 100755
index 0000000000000000000000000000000000000000..aa3cbc51fdc5316e3dc5c517c64ced4f1f4c7d61
GIT binary patch
literal 2990
zcmeH}e>4+%AIA-kQH@(9az*u&bfrS*ZY)w#B4bp3EZL7z?E3vHquiTZ7x^*LHcs^*
z8xu3b%(mMPGVIDDuC-ZpO@546eyo{2I-NQ_=iGbF({r9bpFiH`d(QW~&-?TFd_RAD
zUs<QT+(BzLuTfJ|19=>CgQ=+j4y{V8t-g8_IK5qe^)QY-ayr%*i;hhQjYg@tAhG9B
z<{lBD7!(W@icE@nih`)Atv%)8=Hiz)JS7x*35L|KzclQF?Xq))!|!Z)w^B!O)rQ}{
zTXa(8x4<})V#Pn(^!mqB^p{DxM{RF9=FU!zvXNyXk;oaa;srJYXd8XA&-~m69pa>?
zyQ~TT$XJzzx|Zg;5BgyEGt;W!zcwA>d|B>ulD5&8<-W@Fx#^EReM<T?*~fBUXZke$
z$DY1S;><8Et$$E}VB=EdbE6%3X7Vxi^=l;3<Ma7xN%Ir<igyACi^UQ)Fk+LF-^<4M
zrFzbejza<g7y{{jKd4H2-kY7Bz2YruPgT5noZZnzy`oxC_E&kYCI-LnwBkQ%V_r(!
zrw)Cfdhs;5H0t%z($JdyJG0-cM%kJzk9rkX^$qQRi!GqbrlzbEnTAIumzS^LSV{?n
zWu&?MfO*5enVUQ|WuFIne5oie_|5#{eOiO_T$nK2z_iA}y+xr=0D(Yd@GSy?u)r;K
zEgoA<-s1_VyZCn5_lbbV;~4}hmnSBUbA;Q%JNQDOaIg-+$bK_Gvf}5NLH*fX(KwkT
zXY}Hx<U*UB$l7pzLk)}BjDLt_wN6cWmgn$qy=b~kCIzj|aO3fLACS$Nfyz49(b>Vl
zL1R)Yh|4S4D_H9zjo<1$4y|`|cJ9@ez2j<hPTX2nDi(zhr1u>H|CgWL-QD|Tr>G<T
zDJ>`oFd@ozHa@VpK4JXv9Xnz*9BW%RF@sGA9fOm5+|ZR%M8@8tiaz!d5!jZpNbL^a
ziH~X*cp`m@C>iRa1*e-NQVkGZ9|piwbgzWY3uY1;4AFmF9PG1D5ltxmZ^DasP~SP?
zM(h5AP-vZ2V}VO)rx;Jr9MP>3c9&cxI|?$gA?UZDCND3qO0%0~G*7J(*&ukd^B@*8
z&XtM1Qd)BH5kaDV#+%{5Yn=j~Hx=3Lcf=eB4|rd56obKp%`aqjWP@WQq307CS!W4A
zjF#49Z9}!h7QA*K%*G#!^pMaiOOR>Bm3bE$5(UYW9AUhfzE0v#8oyQmqb(n(ZrSv9
zr)AaT_E(@#!QbnZy0UX>xF;OUf+v*JVGdfCeFA~n)`AyB|31-^)FMxi=q$~c1PIvE
z;!qK>f8VHM4C?@0Fi0}mkFFe&Y9qsK%V9h6Q83mB3A~69E4L4n()@(6tY?USKrWB#
z-Ut)36N5}4ySJoVQJK@6o*Im_r%vJo)KKF`hS^6B?&e`>_Kd-cHa*di=w8UWEia0b
zcJ<eZ&W5m3A}`)cPClq<dfLZ6HY_GEEO(h#+E$N>j)}32I)R?Av{8EA8QxVwLj@*b
z7hZ!LDdPhJ1LEr2^;LdV)eRDQ;Npe|6MiA{y9%YCmL?g6E-oyPueK6>O$CTr$=3ev
zShDn(aU3PvA!+F8Q;)PAz20;0+D5(&UnnoTH?r_U!ucgr@Zsl?vBOtcL<ptW<BYoU
zZ#F*I`N}zW%bEMhcRYXi4%>}00F3<>xstKCxCl&hPSmxh@Wicz+QW2p)DDy72X2+6
zS$?l!Pl()fz3Fwmhrz>`ZA#U*io{d#K${-izEb%~QeC*-X>$3urlvy7wG1rTY9jpJ
zbE&aTA^{b#g;{KC6rZw@yqv;p^&|qiiYVzFx<R%<c_6n4&VXB2T;;rtpy;wD^ThA^
zzys3AzFYNB|KbI4NLD)I42;<P8e753iqHs?f~FhuY9khjnet&%NoF&i%%-$GNvd3C
zJ&B)^$tKVR5v+}#9E~d2bX{=p&PvD<1uE_8K#y5u_E5@lx2#KCu|LKM6i8_pez8bf
zKGc}0rDLu!EVe!*H#!XGW$KwdvDfTRi24KDCp5dBt{U@RvL|M(Kle7kge}=0Up4k9
zH#H84OHFl(F~hwwZ(`Nny+ZL3VI5NR6Uutc`~-zJ1TEEcP>QznXXhxxM%Hv|KE3vK
zCt1OfdNAKXVzvbY1Y|(@24ovr#GZ1UNo){$dKwMWcen`O+gO`&S{?U|)RL0rQr#+&
zAs-jQZ5_5rSv~#3d<}dGPx69y&>rVMV;AGtjImQqkJeWVi>w=J%V*;^Ou8WBs;#9(
zdh6&V*Jx{+E(wlWKSXbThG6rmWCDV*P1rz$-Z=RR@k0IS#!X?-n&8>><>NE$1lvZ*
zxXjxzI3xt^!%%FN2HWWe0Dj@vWyfKvoW$Ma()Beaq^{r~sq&ff9#?U}0v1Arwu5kZ
z1Vio!fm}Y^vpi<0!(_*G8rW3#_xI!50hIR}8s@khJk<j4dtSN8^oqMY#^~yqlUjlW
z!mcjHkag-S^hzU>X^f@ZE$%&3HoyjN1K!WD$l(Da2ZyK;$nW6~Pt5o{rT!Rp&OhXg
zB0=8kN9t{<n$FOdp~@7K$t^9Y9D3T@xQ<BQ;28r>x85;0;qL(2uU=EfL1VK7Wwg8k
z5eoO9NHcg_XOEj)Ys=^E9W{Dkfn}HvSf<zejtEuVsAQcQ24KTJ6#`ZG+cSF8x<S3!
zft-q$6@s5&<3r+d7b`Z27B$Y!=O#GSyI9tvvgiSQPvU7+s<h2Xci;|AxmS%ta=J=}
z=h<0Q@GDaVj0xK9aAGvE`F(i--sSRCbg$U0Ym7)S*~*J0I~3>&COuFYu=bET@aDaU
zu0hgPY$3C`*@*CPE~|5La&n~)hihgq7~G6}=ySsre$SA9*vN7DeQ)~dJs*JN^Ot>=
zs*$n&|E%&QhJ5ilf5j@<YX57Z`iO#`*zEIq{v+)At1ka-(SL6GDm48Xe)V5O0JPK&
Ya}QAOQoUZT0=SyT5id8Y>$z+H0-+}W0RR91

literal 0
HcmV?d00001

diff --git a/framework/res/layout/preview.xml b/framework/res/layout/preview.xml
deleted file mode 100644
index f7fe83aa..00000000
--- a/framework/res/layout/preview.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent" android:layout_height="fill_parent"
-    android:orientation="horizontal">
-    <SurfaceView android:id="@+id/surface"
-        android:layout_width="fill_parent" android:layout_height="fill_parent"
-        android:layout_weight="1">
-    </SurfaceView>
-    <Button
-    	android:id="@+id/go"
- 		android:layout_width="wrap_content" 
-	    android:layout_height="wrap_content" 
-	    android:layout_gravity="center_horizontal"
-	    
-	    android:text="@string/go"
-	    android:minWidth="50dip"
-	    android:layout_alignParentRight="true"
-	    android:layout_alignParentTop="true"
-	    android:layout_marginRight="5dip"
-	    android:layout_marginTop="5dip"
-	    />
-	    
-</RelativeLayout>
\ No newline at end of file
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index ce9b7604..8771da3d 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -38,6 +38,7 @@ import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Environment;
 import android.util.Log;
@@ -53,6 +54,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.webkit.GeolocationPermissions.Callback;
 import android.webkit.WebSettings.LayoutAlgorithm;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.os.Build.*;
 import android.provider.MediaStore;
@@ -61,6 +63,7 @@ public class DroidGap extends Activity {
 		
 	private static final String LOG_TAG = "DroidGap";
 	protected WebView appView;
+	protected ImageView splashScreen;
 	private LinearLayout root;	
 	
 	private Device gap;
@@ -77,39 +80,53 @@ public class DroidGap extends Activity {
 	private AudioHandler audio;
     private CallbackServer callbackServer;
 	private CommandManager commandManager;
-
+	
 	private Uri imageUri;
 	
     /** Called when the activity is first created. */
 	@Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         getWindow().requestFeature(Window.FEATURE_NO_TITLE); 
         getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
                 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!
-        
-        LinearLayout.LayoutParams containerParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 
-        		ViewGroup.LayoutParams.FILL_PARENT, 0.0F);
-         
-        LinearLayout.LayoutParams webviewParams = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT,
-        		ViewGroup.LayoutParams.FILL_PARENT, 1.0F);
-        
+
         root = new LinearLayout(this);
         root.setOrientation(LinearLayout.VERTICAL);
         root.setBackgroundColor(Color.BLACK);
-        root.setLayoutParams(containerParams);
-                
-        appView = new WebView(this);
-        appView.setLayoutParams(webviewParams);
-        
+        root.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, 
+        		ViewGroup.LayoutParams.FILL_PARENT, 0.0F));
+
+        splashScreen = new ImageView(this);
+        splashScreen.setLayoutParams(new LinearLayout.LayoutParams(
+        		ViewGroup.LayoutParams.FILL_PARENT,
+        		ViewGroup.LayoutParams.FILL_PARENT, 
+        		1.0F));
+        splashScreen.setImageResource(R.drawable.splash);
+      
+        root.addView(splashScreen);
+ 
+        initWebView();
+
+        setContentView(root);        
+	}
+	
+	private void initWebView() {
+		appView = new WebView(DroidGap.this);
+		
+        appView.setLayoutParams(new LinearLayout.LayoutParams(
+        		ViewGroup.LayoutParams.FILL_PARENT,
+        		ViewGroup.LayoutParams.FILL_PARENT, 
+        		1.0F));
+
         WebViewReflect.checkCompatibility();
-                
-        if (android.os.Build.VERSION.RELEASE.startsWith("2."))
-        	appView.setWebChromeClient(new EclairClient(this));        	
-        else
-        {        
-        	appView.setWebChromeClient(new GapClient(this));
+
+        if (android.os.Build.VERSION.RELEASE.startsWith("2.")) {
+        	appView.setWebChromeClient(new EclairClient(DroidGap.this));        	
+        } else {
+        	appView.setWebChromeClient(new GapClient(DroidGap.this));
         }
            
         appView.setWebViewClient(new GapViewClient(this));
@@ -131,23 +148,15 @@ public class DroidGap extends Activity {
         WebViewReflect.setDomStorage(settings);
         // Turn off native geolocation object in browser - we use our own :)
         WebViewReflect.setGeolocationEnabled(settings, true);
-        /* Bind the appView object to the gap class methods */
+        // Bind the appView object to the gap class methods
         bindBrowser(appView);
         if(cupcakeStorage != null)
         	cupcakeStorage.setStorage(appPackage);
-                
-        root.addView(appView);   
         
         // 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;}");
-
-        setContentView(root);                        
-    }
-	
-	public void invoke(String origin, boolean allow, boolean remember) {
-
 	}
 	
 	@Override
@@ -260,6 +269,7 @@ public class DroidGap extends Activity {
     	appView.addJavascriptInterface(mKey, "BackButton");
     	appView.addJavascriptInterface(audio, "GapAudio");
         appView.addJavascriptInterface(callbackServer, "CallbackServer");
+    	//appView.addJavascriptInterface(new SplashScreen(this), "SplashScreen");
     	
     	if (android.os.Build.VERSION.RELEASE.startsWith("1."))
     	{
@@ -272,7 +282,7 @@ public class DroidGap extends Activity {
  
 	public void loadUrl(String url)
 	{
-		appView.loadUrl(url);
+		this.appView.loadUrl(url);
 	}
     
     /**
@@ -411,33 +421,39 @@ public class DroidGap extends Activity {
 
     public boolean onKeyDown(int keyCode, KeyEvent event)
     {
-    	
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-        	if (mKey.isBound())
-        	{
-        		//We fire an event here!
-        		appView.loadUrl("javascript:document.keyEvent.backTrigger()");
-        	}
-        	else
-        	{
-        		String testUrl = appView.getUrl();
-        		appView.goBack();
-        		if(appView.getUrl().equals(testUrl))
-        		{
-        			return super.onKeyDown(keyCode, event);
-        		}
-        	}
-        }
-        
-        if (keyCode == KeyEvent.KEYCODE_MENU) 
-        {
-        	// This is where we launch the menu
-        	appView.loadUrl("javascript:keyEvent.menuTrigger()");
-        }
-                
+	    if (keyCode == KeyEvent.KEYCODE_BACK) {
+	    	if (mKey.isBound())
+	    	{
+	    		//We fire an event here!
+	    		appView.loadUrl("javascript:document.keyEvent.backTrigger()");
+	    	}
+	    	else
+	    	{
+	    		String testUrl = appView.getUrl();
+	    		appView.goBack();
+	    		if(appView.getUrl().equals(testUrl))
+	    		{
+	    			return super.onKeyDown(keyCode, event);
+	    		}
+	    	}
+	    }
+	    
+	    if (keyCode == KeyEvent.KEYCODE_MENU) 
+	    {
+	    	// This is where we launch the menu
+	    	appView.loadUrl("javascript:keyEvent.menuTrigger()");
+	    }
         return false;
     }
 	
+    /**
+     * Removes the splash screen from root view and adds the WebView
+     */
+    public void hideSplashScreen() {
+    	root.removeView(splashScreen);
+    	root.addView(appView);
+    }
+    
     // This is required to start the camera activity!  It has to come from the previous activity
     public void startCamera()
     {
@@ -469,11 +485,5 @@ public class DroidGap extends Activity {
     	   {
     		   launcher.failPicture("Did not complete!");
     	   }
-    }
-
-    public WebView getView()
-    {
-      return this.appView;
-    }
-      
+    }      
 }
diff --git a/framework/src/com/phonegap/SplashScreen.java b/framework/src/com/phonegap/SplashScreen.java
new file mode 100644
index 00000000..98bfd60e
--- /dev/null
+++ b/framework/src/com/phonegap/SplashScreen.java
@@ -0,0 +1,15 @@
+package com.phonegap;
+
+public class SplashScreen {
+	private final DroidGap gap;
+	public SplashScreen(DroidGap gap) {
+		this.gap = gap;
+	}
+	public void hide() {
+		gap.runOnUiThread(new Runnable() {
+			public void run() {
+				gap.hideSplashScreen();
+			}
+		});
+	}
+}
diff --git a/framework/src/com/phonegap/api/Command.java b/framework/src/com/phonegap/api/Command.java
index 479a3535..5c28f43d 100644
--- a/framework/src/com/phonegap/api/Command.java
+++ b/framework/src/com/phonegap/api/Command.java
@@ -1,24 +1,41 @@
 package com.phonegap.api;
 
-import android.content.Context;
+import org.json.JSONArray;
 
+import android.content.Context;
+import android.webkit.WebView;
+
+/**
+ * Command interface must be implemented by any plugin classes.
+ *
+ * The execute method is called by the CommandManager.
+ *
+ * @author davejohnson
+ *
+ */
 public interface Command {
 	/**
-	 * Executes the request and returns JS code to change client state.
-	 *
-	 * @param action the command to execute
-	 * @return a string with JavaScript code or null
+	 * Executes the request and returns CommandResult.
+	 * 
+	 * @param action The command to execute.
+	 * @param args JSONArry of arguments for the command.
+	 * @return A CommandResult object with a status and message.
 	 */
-	CommandResult execute(String action, String[] args);
+	CommandResult execute(String action, JSONArray args);
 
 	/**
-	 * Determines if this command can process a request.
-	 *
-	 * @param action the command to execute
-	 *
-	 * @return true if this command understands the petition
+	 * Sets the context of the Command. This can then be used to do things like
+	 * get file paths associated with the Activity.
+	 * 
+	 * @param ctx The context of the main Activity.
 	 */
-	boolean accept(String action);
-
 	void setContext(Context ctx);
+
+	/**
+	 * Sets the main View of the application, this is the WebView within which 
+	 * a PhoneGap app runs.
+	 * 
+	 * @param webView The PhoneGap WebView
+	 */
+	void setView(WebView webView);
 }
diff --git a/framework/src/com/phonegap/api/CommandManager.java b/framework/src/com/phonegap/api/CommandManager.java
index 58bb146d..9a53f592 100644
--- a/framework/src/com/phonegap/api/CommandManager.java
+++ b/framework/src/com/phonegap/api/CommandManager.java
@@ -1,12 +1,21 @@
 package com.phonegap.api;
 
+import org.json.JSONArray;
+import org.json.JSONException;
+
 import android.content.Context;
 import android.webkit.WebView;
 
 import com.phonegap.DroidGap;
 
 /**
- * Given a execution request detects matching {@link Command} and executes it.
+ * CommandManager is exposed to JavaScript in the PhoneGap WebView.
+ * 
+ * Calling native plugin code can be done by calling CommandManager.exec(...)
+ * from JavaScript.
+ * 
+ * @author davejohnson
+ *
  */
 public final class CommandManager {
 	private static final String EXCEPTION_PREFIX = "[PhoneGap] *ERROR* Exception executing command [";
@@ -23,42 +32,57 @@ public final class CommandManager {
 	}
 
 	/**
-	 * Receives a request for execution and fulfills it as long as one of
-	 * the configured {@link Command} can understand it. Command precedence
-	 * is important (just one of them will be executed).
-	 *
-	 * @param instruction any API command
-	 * @return JS code to execute by the client or null
+	 * Receives a request for execution and fulfills it by finding the appropriate
+	 * Java class and calling it's execute method.
+	 * 
+	 * CommandManager.exec can be used either synchronously or async. In either case, a JSON encoded 
+	 * string is returned that will indicate if any errors have occurred when trying to find
+	 * or execute the class denoted by the clazz argument.
+	 * 
+	 * @param clazz String containing the fully qualified class name. e.g. com.phonegap.FooBar
+	 * @param action String containt the action that the class is supposed to perform. This is
+	 * passed to the plugin execute method and it is up to the plugin developer 
+	 * how to deal with it.
+	 * @param callbackId String containing the id of the callback that is execute in JavaScript if
+	 * this is an async plugin call.
+	 * @param args An Array literal string containing any arguments needed in the
+	 * plugin execute method.
+	 * @param async Boolean indicating whether the calling JavaScript code is expecting an
+	 * immediate return value. If true, either PhoneGap.callbackSuccess(...) or PhoneGap.callbackError(...)
+	 * is called once the plugin code has executed.
+	 * @return JSON encoded string with a response message and status.
 	 */
 	public String exec(final String clazz, final String action, final String callbackId, 
-			final String args, final boolean async) {
+			final String jsonArgs, final boolean async) {
 		CommandResult cr = null;
 		try {
-			//final WebView wv = this.app;
-			final String _callbackId = callbackId;
-			final String[] aargs = args.split("__PHONEGAP__");
-			Class c = Class.forName(clazz);
-			Class[] interfaces = c.getInterfaces();
-			for (int j=0; j<interfaces.length; j++) {
-				if (interfaces[j].getName().equals("com.phonegap.api.Command")) {
-					final Command ci = (Command)c.newInstance();
-					ci.setContext(this.ctx);
-					if (async) {
-						// Run this async on the UI thread
-						app.post(new Runnable() {
-							public void run() {
-								CommandResult cr = ci.execute(action, aargs);
-								if (cr.getStatus() == 0) {
-									app.loadUrl("javascript:PhoneGap.callbackSuccess('"+callbackId+"', " + cr.getResult()+ ");");
-								} else {
-									app.loadUrl("javascript:PhoneGap.callbackFailure('"+callbackId+"', " + cr.getResult() + ");");
-								}
+			final JSONArray args = new JSONArray(jsonArgs);
+			Class c = getClassByName(clazz);
+			if (isPhoneGapCommand(c)) {
+				// Create a new instance of the plugin and set the context and webview
+				final Command plugin = (Command)c.newInstance();
+				plugin.setContext(this.ctx);
+				plugin.setView(this.app);
+
+				if (async) {
+					// Run this async on the UI thread so that JavaScript can continue on
+					app.post(new Runnable() {
+						public void run() {
+							// Call execute on the plugin so that it can do it's thing
+							CommandResult cr = plugin.execute(action, args);
+							// Check if the 
+							if (cr.getStatus() == 0) {
+								app.loadUrl(cr.toSuccessCallbackString(callbackId));
+							} else {
+								app.loadUrl(cr.toErrorCallbackString(callbackId));
 							}
-						});
-						return "";
-					} else {
-						cr = ci.execute(action, aargs);
-					}
+						}
+					});
+					// Return "" 
+					return "";
+				} else {
+					// Call execute on the plugin so that it can do it's thing
+					cr = plugin.execute(action, args);
 				}
 			}
 		} catch (ClassNotFoundException e) {
@@ -70,11 +94,44 @@ public final class CommandManager {
 		} catch (InstantiationException e) {
 			cr = new CommandResult(CommandResult.Status.INSTANTIATIONEXCEPTION, 
 					"{ message: 'InstantiationException', status: "+CommandResult.Status.INSTANTIATIONEXCEPTION.ordinal()+" }");
+		} catch (JSONException e) {
+			cr = new CommandResult(CommandResult.Status.JSONEXCEPTION, 
+					"{ message: 'JSONException', status: "+CommandResult.Status.JSONEXCEPTION.ordinal()+" }");
 		}
 		// if async we have already returned at this point unless there was an error...
 		if (async) {
-			app.loadUrl("javascript:PhoneGap.callbackFailure('"+callbackId+"', " + cr.getResult() + ");");
+			app.loadUrl(cr.toErrorCallbackString(callbackId));
 		}
 		return ( cr != null ? cr.getResult() : "{ status: 0, message: 'all good' }" );
 	}
+	
+	/**
+	 * 
+	 * 
+	 * @param clazz
+	 * @return
+	 * @throws ClassNotFoundException
+	 */
+	private Class getClassByName(final String clazz) throws ClassNotFoundException {
+		return Class.forName(clazz);
+	}
+
+	/**
+	 * Get the interfaces that a class implements and see if it implements the
+	 * com.phonegap.api.Command interface.
+	 * 
+	 * @param c The class to check the interfaces of.
+	 * @return Boolean indicating if the class implements com.phonegap.api.Command
+	 */
+	private boolean isPhoneGapCommand(Class c) {
+		boolean isCommand = false;
+		Class[] interfaces = c.getInterfaces();
+		for (int j=0; j<interfaces.length; j++) {
+			if (interfaces[j].getName().equals("com.phonegap.api.Command")) {
+				isCommand = true;
+				break;
+			}
+		}
+		return isCommand;
+	}
 }
\ No newline at end of file
diff --git a/framework/src/com/phonegap/api/CommandResult.java b/framework/src/com/phonegap/api/CommandResult.java
index b2084f9d..75843d99 100644
--- a/framework/src/com/phonegap/api/CommandResult.java
+++ b/framework/src/com/phonegap/api/CommandResult.java
@@ -17,6 +17,14 @@ public class CommandResult {
 		return result;
 	}
 	
+	public String toSuccessCallbackString(String callbackId) {
+		return "javascript:PhoneGap.callbackSuccess('"+callbackId+"', " + this.getResult()+ ");";
+	}
+	
+	public String toErrorCallbackString(String callbackId) {
+		return "javascript:PhoneGap.callbackError('"+callbackId+"', " + this.getResult()+ ");";
+	}
+	
 	public enum Status {
 		OK,
 		CLASSNOTFOUNDEXCEPTION,
@@ -24,6 +32,7 @@ public class CommandResult {
 		INSTANTIATIONEXCEPTION,
 		MALFORMEDURLEXCEPTION,
 		IOEXCEPTION,
-		INVALIDACTION
+		INVALIDACTION,
+		JSONEXCEPTION
 	}
 }
diff --git a/framework/src/com/phonegap/api/impl/Cache.java b/framework/src/com/phonegap/api/impl/Cache.java
deleted file mode 100644
index a9d54f4d..00000000
--- a/framework/src/com/phonegap/api/impl/Cache.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.phonegap.api.impl;
-
-import java.io.BufferedInputStream;
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
-import android.content.Context;
-
-import com.phonegap.api.Command;
-import com.phonegap.api.CommandResult;
-
-public final class Cache implements Command {
-	
-	private Context ctx;
-	
-	public boolean accept(String action) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	
-	public void setContext(Context ctx) {
-		this.ctx = ctx;
-	}
-
-	public CommandResult execute(String action, String[] args) {
-
-		CommandResult.Status status = CommandResult.Status.OK;
-		String result = "";
-
-		String uri = args[0];
-		String fileName = md5(uri);
-		
-		if (action.equals("getCachedPathForURI") && args.length == 1)
-		{
-			// First check if the file exists already
-			String fileDir = ctx.getFilesDir().getAbsolutePath();
-			String filePath = fileDir + "/" + fileName;
-			
-			File f = new File(filePath);
-			if (f.exists()) {
-				result = "{ file: '"+filePath+"', status: 0 }";
-			} else {
-
-				URL u;
-				InputStream is = null;
-				DataInputStream dis;
-				FileOutputStream out = null;
-				byte[] buffer = new byte[1024];
-				int length = -1;
-				
-				try {
-					u = new URL(uri);
-					is = u.openStream();         // throws an IOException
-					dis = new DataInputStream(new BufferedInputStream(is));
-					out = ctx.openFileOutput(fileName, Context.MODE_PRIVATE);
-					while ((length = dis.read(buffer)) != -1) {
-						out.write(buffer, 0, length);
-					}
-					out.flush();
-					result = "{ file: '"+fileName+"', status: 0 }";
-				} catch (MalformedURLException e) {
-					status = CommandResult.Status.MALFORMEDURLEXCEPTION;
-					result = "{ message: 'MalformedURLException', status: "+status.ordinal()+" }";
-				} catch (IOException e) {
-					status = CommandResult.Status.IOEXCEPTION;
-					result = "{ message: 'IOException', status: "+status.ordinal()+" }";
-				} finally {
-					try {
-						is.close();
-						out.close();
-					} catch (IOException e) {
-						status = CommandResult.Status.IOEXCEPTION;
-						result = "{ message: 'IOException', status: "+status.ordinal()+" }";
-					}
-				}
-			}
-		} else {
-			status = CommandResult.Status.INVALIDACTION;
-			result = "{ message: 'InvalidAction', status: "+status.ordinal()+" }";
-		}
-		return new CommandResult(status, result);
-	}
-	
-	public String md5(String s) {  
-	    try {  
-	        // Create MD5 Hash  
-	        MessageDigest digest = java.security.MessageDigest.getInstance("MD5");  
-	        digest.update(s.getBytes());  
-	        byte messageDigest[] = digest.digest();  
-
-	        // Create Hex String  
-	        StringBuffer hexString = new StringBuffer();  
-	        for (int i=0; i<messageDigest.length; i++)  
-	            hexString.append(Integer.toHexString(0xFF & messageDigest[i]));  
-	        return hexString.toString();  
-	          
-	    } catch (NoSuchAlgorithmException e) {  
-	        e.printStackTrace();  
-	    }  
-	    return "";  
-	}
-}