Change to use Commands and CommandManager.

framework/src/com/phonegap/api/Command.java

@@ -2,7 +2,10 @@ package com.phonegap.api;
 
 import org.json.JSONArray;
 
+import com.phonegap.DroidGap;
+
 import android.content.Context;
+import android.content.Intent;
 import android.webkit.WebView;
 
 /**
@@ -29,7 +32,7 @@ public interface Command {
 	 * 
 	 * @param ctx The context of the main Activity.
 	 */
-	void setContext(Context ctx);
+	void setContext(DroidGap ctx);
 
 	/**
 	 * Sets the main View of the application, this is the WebView within which 
@@ -38,4 +41,31 @@ public interface Command {
 	 * @param webView The PhoneGap WebView
 	 */
 	void setView(WebView webView);
+		
+    /**
+     * Called when the system is about to start resuming a previous activity. 
+     */
+    void onPause();
+
+    /**
+     * Called when the activity will start interacting with the user. 
+     */
+    void onResume();
+    
+    /**
+     * The final call you receive before your activity is destroyed. 
+     */
+    void onDestroy();
+	
+    /**
+     * Called when an activity you launched exits, giving you the requestCode you started it with,
+     * the resultCode it returned, and any additional data from it. 
+     * 
+     * @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 data				An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
+     */
+    void onActivityResult(int requestCode, int resultCode, Intent intent);
+
 }

framework/src/com/phonegap/api/CommandManager.java

@@ -1,9 +1,13 @@
 package com.phonegap.api;
 
+import java.util.HashMap;
+import java.util.Map.Entry;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 
 import android.content.Context;
+import android.content.Intent;
 import android.webkit.WebView;
 
 import com.phonegap.DroidGap;
@@ -18,12 +22,13 @@ import com.phonegap.DroidGap;
  *
  */
 public final class CommandManager {	
-	private Command[] commands;
 	
-	private final Context ctx;
+	private HashMap<String, Command> commands = new HashMap<String,Command>();
+	
+	private final DroidGap ctx;
 	private final WebView app;
 	
-	public CommandManager(WebView app, Context ctx) {
+	public CommandManager(WebView app, DroidGap ctx) {
 		this.ctx = ctx;
 		this.app = app;
 	}
@@ -49,18 +54,15 @@ public final class CommandManager {
 	 * 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 jsonArgs, final boolean async) {
+	public String exec(final String clazz, final String action, final String callbackId, final String jsonArgs, final boolean async) {
 		CommandResult cr = null;
 		try {
 			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);
-
+				final Command plugin = this.addCommand(clazz); 
+				final DroidGap ctx = this.ctx;
 				if (async) {
 					// Run this on a different thread so that this one can return back to JS
 					Thread thread = new Thread(new Runnable() {
@@ -69,9 +71,9 @@ public final class CommandManager {
 							CommandResult cr = plugin.execute(action, args);
 							// Check the status for 0 (success) or otherwise
 							if (cr.getStatus() == 0) {
-								app.loadUrl(cr.toSuccessCallbackString(callbackId));
+								ctx.sendJavascript(cr.toSuccessCallbackString(callbackId));
 							} else {
-								app.loadUrl(cr.toErrorCallbackString(callbackId));
+								ctx.sendJavascript(cr.toErrorCallbackString(callbackId));
 							}
 						}
 					});
@@ -84,16 +86,13 @@ public final class CommandManager {
 			}
 		} catch (ClassNotFoundException e) {
 			cr = new CommandResult(CommandResult.Status.CLASS_NOT_FOUND_EXCEPTION);
-		} catch (IllegalAccessException e) {
-			cr = new CommandResult(CommandResult.Status.ILLEGAL_ACCESS_EXCEPTION);
-		} catch (InstantiationException e) {
-			cr = new CommandResult(CommandResult.Status.INSTANTIATION_EXCEPTION);
 		} catch (JSONException e) {
+			System.out.println("ERROR: "+e.toString());
 			cr = new CommandResult(CommandResult.Status.JSON_EXCEPTION);
 		}
 		// if async we have already returned at this point unless there was an error...
 		if (async) {
-			app.loadUrl(cr.toErrorCallbackString(callbackId));
+			ctx.sendJavascript(cr.toErrorCallbackString(callbackId));
 		}
 		return ( cr != null ? cr.getJSONString() : "{ status: 0, message: 'all good' }" );
 	}
@@ -127,4 +126,80 @@ public final class CommandManager {
 		}
 		return isCommand;
 	}
+	
+    /**
+     * Add command to be loaded and cached.
+     * If command is already created, then just return it.
+     * 
+     * @param className				The class to load
+     * @return						The command
+     */
+	public Command addCommand(String className) {
+    	if (this.commands.containsKey(className)) {
+    		return this.getCommand(className);
+    	}
+    	try {
+              Command command = (Command)Class.forName(className).newInstance();
+              this.commands.put(className, command);
+              command.setContext((DroidGap)this.ctx);
+              command.setView(this.app);
+              return command;
+    	}
+    	catch (Exception e) {
+    		  e.printStackTrace();
+    		  System.out.println("Error adding command "+className+".");
+    	}
+    	return null;
+    }
+    
+    /**
+     * Get the loaded command.
+     * 
+     * @param className				The class of the loaded command.
+     * @return
+     */
+    public Command getCommand(String className) {
+    	Command command = this.commands.get(className);
+    	return command;
+    }
+
+    /**
+     * Called when the system is about to start resuming a previous activity. 
+     */
+    public void onPause() {
+    	java.util.Set<Entry<String,Command>> s = this.commands.entrySet();
+    	java.util.Iterator<Entry<String,Command>> it = s.iterator();
+    	while(it.hasNext()) {
+    		Entry<String,Command> entry = it.next();
+    		Command command = entry.getValue();
+    		command.onPause();
+    	}
+    }
+    
+    /**
+     * Called when the activity will start interacting with the user. 
+     */
+    public void onResume() {
+    	java.util.Set<Entry<String,Command>> s = this.commands.entrySet();
+    	java.util.Iterator<Entry<String,Command>> it = s.iterator();
+    	while(it.hasNext()) {
+    		Entry<String,Command> entry = it.next();
+    		Command command = entry.getValue();
+    		command.onResume();
+    	}    	
+    }
+
+    /**
+     * The final call you receive before your activity is destroyed. 
+     */
+    public void onDestroy() {
+    	java.util.Set<Entry<String,Command>> s = this.commands.entrySet();
+    	java.util.Iterator<Entry<String,Command>> it = s.iterator();
+    	while(it.hasNext()) {
+    		Entry<String,Command> entry = it.next();
+    		Command command = entry.getValue();
+    		command.onDestroy();
+    	}
+    }
+    
 }

framework/src/com/phonegap/api/CommandResult.java

@@ -21,6 +21,19 @@ public class CommandResult {
 		this.message = message.toString();
 	}
 	
+	public CommandResult(Status status, int i) {
+		this.status = status.ordinal();
+		this.message = ""+i;
+	}
+	public CommandResult(Status status, float f) {
+		this.status = status.ordinal();
+		this.message = ""+f;
+	}
+	public CommandResult(Status status, boolean b) {
+		this.status = status.ordinal();
+		this.message = ""+b;
+	}
+	
 	public int getStatus() {
 		return status;
 	}