Add better support for Activity result callbacks from plugins. Add some sugar for calling success / error callbacks from plugins

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.
      * 
@@ -40,4 +40,11 @@ public abstract class PhonegapActivity extends Activity {
      * @param requestCode		The request code that is passed to callback to identify the activity
      */
     abstract public void startActivityForResult(Plugin 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(Plugin plugin);
 }

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
 
@@ -126,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.
      * 
@@ -135,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));
+    }
 }

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

@@ -101,7 +101,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));
 							}
 						}
@@ -160,24 +160,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.