Accept IPlugin for result callback when starting activities for result.

Merge pull request #138 from davejohnson/iplugin-fix
Update PluginManager to accept plugins implementing IPlugin too
2011-07-07 14:11:03 -05:00 · 2011-07-07 12:00:36 -07:00 · 2011-07-08 01:06:27 +08:00 · 2011-07-07 09:19:39 -07:00 · 2011-07-07 00:12:44 -07:00 · 2011-07-06 13:56:49 -05:00
15 changed files with 270 additions and 132 deletions
@@ -1,3 +1,4 @@
+.DS_Store
 default.properties
 gen
 assets/www/phonegap.js
@@ -5,4 +6,4 @@ local.properties
 framework/phonegap.jar
 framework/bin
 framework/assets/www/.DS_Store
-.DS_Store
+.DS_Store
@@ -1 +1 @@
-0.9.6
+0.9.6.1
@@ -5,8 +5,8 @@
    <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.0.9.5.min.js"></script>
-	  <script type="text/javascript" charset="utf-8" src="main.js"></script>  
+	  <script type="text/javascript" charset="utf-8" src="phonegap.0.9.6.1.min.js"></script>
+	  <script type="text/javascript" charset="utf-8" src="main.js"></script>

  </head>
  <body onload="init();" id="stage" class="theme">
@@ -31,8 +31,8 @@
    <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>
    <a href="#" class="btn large" onclick="check_network();">Check Network</a>
-    <div id="viewport" class="viewport" style="display: none;">       
+    <div id="viewport" class="viewport" style="display: none;">
      <img style="width:60px;height:60px" id="test_img" src="" />
-    </div> 
+    </div>
  </body>
 </html>
@@ -30,15 +30,18 @@

    <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">
+            <intent-filter>
+            </intent-filter>
+        </activity>
    </application>

-	  <uses-sdk android:minSdkVersion="2" />
-
+	<uses-sdk android:minSdkVersion="2" />
 </manifest> 
@@ -1,7 +1,7 @@
 <html>
  <head>
    <title></title>
-    <script src="phonegap.0.9.5.min.js"></script>
+    <script src="phonegap.0.9.6.1.min.js"></script>
  </head>
  <body>

@@ -0,0 +1,20 @@
+<!--?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="Location" value="com.phonegap.GeoBroker"/>
+    <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>
@@ -12,6 +12,7 @@ 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.
@@ -83,8 +84,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++) {
@@ -92,31 +96,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);
 	}

 	/**
@@ -264,16 +264,18 @@ public class ContactAccessorSdk5 extends ContactAccessor {
 						newContact = false;
 						contact.put("id", contactId);
 						contact.put("rawId", rawId);
-						contact.put("displayName", c.getString(c.getColumnIndex(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME)));
 					}
 					
 					// Grab the mimetype of the current row as it will be used in a lot of comparisons
 					mimetype = c.getString(c.getColumnIndex(ContactsContract.Data.MIMETYPE));
 					
-					if (mimetype.equals(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) 
-							&& isRequired("name",populate)) {
-						contact.put("name", nameQuery(c));
-					}
+                    if (mimetype.equals(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)) {
+                        contact.put("displayName", c.getString(c.getColumnIndex(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME)));
+                    }
+                    if (mimetype.equals(ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE) 
+                            && isRequired("name",populate)) {
+                        contact.put("name", nameQuery(c));
+                    }
 					else if (mimetype.equals(ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE) 
 							&& isRequired("phoneNumbers",populate)) {
 						phones.put(phoneQuery(c));
@@ -18,7 +18,7 @@ import android.provider.Settings;

 public class Device extends Plugin {
 	
-	public static String phonegapVersion = "0.9.5";				// PhoneGap version
+    public static String phonegapVersion = "0.9.6.1";               // PhoneGap version
 	public static String platform = "Android";					// Device OS
 	public static String uuid;									// Device UUID
    
@@ -7,6 +7,9 @@
 */
 package com.phonegap;

+import java.util.HashMap;
+import java.util.Map.Entry;
+
 import org.json.JSONArray;
 import org.json.JSONException;

@@ -46,7 +49,7 @@ import android.widget.EditText;
 import android.widget.LinearLayout;

 import com.phonegap.api.PhonegapActivity;
-import com.phonegap.api.Plugin;
+import com.phonegap.api.IPlugin;
 import com.phonegap.api.PluginManager;

 /**
@@ -131,15 +134,13 @@ public class DroidGap extends PhonegapActivity {
 	// ie http://server/path/index.html#abc?query
 	private String url;
 	
-	// The initial URL for our app up to and including the file name
-	// ie http://server/path/index.html
-	private String urlFile;
-	
-	// 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
-	protected Plugin activityResultCallback = null;
+	protected IPlugin activityResultCallback = null;
 	protected boolean activityResultKeepRunning;

 	// Flag indicates that a loadUrl timeout occurred
@@ -289,23 +290,6 @@ public class DroidGap extends PhonegapActivity {
 		this.callbackServer = new CallbackServer();
 		this.pluginManager = new PluginManager(appView, this);

-		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");
-		this.addService("FileTransfer", "com.phonegap.FileTransfer");
-		this.addService("Capture", "com.phonegap.Capture");
 	}
        
 	/**
@@ -348,14 +332,15 @@ public class DroidGap extends PhonegapActivity {
     */
 	public void loadUrl(final String url) {
 		System.out.println("loadUrl("+url+")");
-		this.urlFile = this.getUrlFile(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);

@@ -613,7 +598,7 @@ 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. 
@@ -723,20 +708,58 @@ public class DroidGap extends PhonegapActivity {
    	this.callbackServer.sendJavascript(statement);
    }
    
+    
    /**
-     * Return up to file part of url.
-     * If url = http://server/page.html#abc, then return http://server/page.html
+     * Display a new browser with the specified URL.
     * 
-     * @param url
-     * @return
+     * 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
     */
-    private String getUrlFile(String url) {
-    	int p1 = url.indexOf("#");
-    	int p2 = url.indexOf("?");
-    	if (p1 < 0) p1 = url.length();
-    	if (p2 < 0) p2 = url.length();
-    	int p3 = (p1 < p2) ? p1 : p2;
-    	return url.substring(0, p3);
+    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();
+		}
    }

    /**
@@ -825,8 +848,11 @@ public class DroidGap extends PhonegapActivity {
         */
        @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 (this.ctx.urlFile.equals(this.ctx.getUrlFile(url))) {
+        	if (url.indexOf(this.ctx.baseUrl) == 0) {
        		reqOk = true;
        	}
 			
@@ -1069,17 +1095,18 @@ public class DroidGap extends PhonegapActivity {
        	// All else
        	else {

-        		int i = url.lastIndexOf('/');
-        		String newBaseUrl = url;
-        		if (i > 0) {
-        			newBaseUrl = url.substring(0, i);
-        		}
-
        		// If our app or file:, then load into our webview
        		// 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://") || this.ctx.baseUrl.equals(newBaseUrl)) {
-        			this.ctx.appView.loadUrl(url);
+        		if (this.ctx.loadInWebView || url.startsWith("file://") || url.indexOf(this.ctx.baseUrl) == 0) {
+        			try {
+        				HashMap<String, Object> params = new HashMap<String, Object>();
+        				params.put("loadingDialog", "");
+        				params.put("hideLoadingDialogOnPageLoad", true);
+        				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
@@ -1250,12 +1277,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);
    }

    /**
@@ -1266,7 +1288,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;
    	
@@ -1291,12 +1313,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.
@@ -66,6 +66,11 @@ public interface IPlugin {
     */
    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. 
     */
@@ -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);
 }
@@ -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));
+    }
 }
@@ -7,13 +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;

 /**
@@ -24,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;
@@ -39,6 +42,33 @@ 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() {
+		XmlResourceParser xml = ctx.getResources().getXml(com.phonegap.R.xml.plugins);
+		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();
+			}
+		}
 	}

 	/**
@@ -75,7 +105,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) {
@@ -101,7 +131,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 +190,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.
@@ -188,12 +201,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);
@@ -212,8 +225,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;
    }
    
@@ -234,11 +247,11 @@ public final class PluginManager {
     * @param multitasking		Flag indicating if multitasking is turned on for app
     */
    public void onPause(boolean multitasking) {
-    	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.onPause(multitasking);
    	}
    }
@@ -249,11 +262,11 @@ public final class PluginManager {
     * @param multitasking		Flag indicating if multitasking is turned on for app
     */
    public void onResume(boolean multitasking) {
-    	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.onResume(multitasking);
    	}    	
    }
@@ -262,11 +275,11 @@ 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();
    	}
    }
@@ -275,11 +288,11 @@ public final class PluginManager {
     * Called when the activity receives a new intent. 
     */    
    public void onNewIntent(Intent intent) {
-    	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.onNewIntent(intent);
    	}
    }
@@ -88,7 +88,7 @@ class Classic

  # copies stuff from src directory into the android project directory (@path)
  def copy_libs
-    version = IO.read(File.join(@framework_dir, '../VERSION'))
+    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
@@ -97,6 +97,9 @@ class Classic
    # 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|
Author	SHA1	Message	Date
Bryce Curtis	0a7a77e77b	Accept IPlugin for result callback when starting activities for result.	2011-07-07 14:11:03 -05:00
Bryce Curtis	9d1e73656f	Merge pull request #138 from davejohnson/iplugin-fix Update PluginManager to accept plugins implementing IPlugin too	2011-07-07 12:00:36 -07:00
macdonst	3895570edd	Fixed Issue 140: Contact.displayName is not being set correctly	2011-07-08 01:06:27 +08:00
Fil Maj	28b01fe494	Fix for #120 : zooming in on input elements when filling out forms. Note, you also have to set initial-scale and maximum-scale properties in your meta name=viewport tag.	2011-07-07 09:19:39 -07:00
Dave Johnson	090890b22a	Update PluginManager to accept plugins that implement IPlugin rather than extend Plugin	2011-07-07 00:12:44 -07:00
Bryce Curtis	ce9d577415	Remove unused code and variable.	2011-07-06 13:56:49 -05:00
Bryce Curtis	cfc9631873	Copy plugins.xml when creating a new project.	2011-07-06 13:36:29 -05:00
Bryce Curtis	3bf48f82af	Merge pull request #136 from brycecurtis/plugins Loading plugins from res/xml/plugins.xml	2011-07-06 11:12:20 -07:00
Dave Johnson	f9bcf71a7a	Merge pull request #134 from davejohnson/plugin-refactor Plugin refactor	2011-07-06 11:10:00 -07:00
Bryce Curtis	9d5aa9406c	Loading plugins from res/xml/plugins.xml	2011-07-05 23:21:32 -05:00
Dave Johnson	0b1e760fc1	Add better support for Activity result callbacks from plugins. Add some sugar for calling success / error callbacks from plugins	2011-07-05 14:13:55 -07:00
Dave Johnson	941b64f6a2	Merge branch 'master' of github.com:phonegap/phonegap-android	2011-06-30 13:43:06 -07:00
Bryce Curtis	c98b758e94	Update version to 0.9.6.1	2011-06-30 13:15:30 -05:00
Bryce Curtis	4b647fc58d	Merge pull request #128 from brycecurtis/pages Update version number and fix issues with prompt().	2011-06-30 08:56:53 -07:00
Bryce Curtis	b7156c6803	Bump up version to 0.9.6 for example.	2011-06-30 10:53:23 -05:00
Bryce Curtis	b8cc36e805	Don't clear activity stack by default.	2011-06-30 10:42:27 -05:00
Bryce Curtis	76b2df208e	Add comment	2011-06-29 18:28:29 -05:00
Bryce Curtis	9643314553	Add more control over how url is loaded.	2011-06-29 18:25:49 -05:00
Bryce Curtis	1e3422ae70	Load new urls in new DroidGap activity - not same webview as initial url.	2011-06-29 18:23:20 -05:00
Bryce Curtis	fc1bea4947	Update version to 0.9.6.	2011-06-29 16:43:52 -05:00
Fil Maj	b5dc62d9ef	fix to build script: gotta strip out new lines from read in version string	2011-06-28 15:20:13 -07:00
Dave Johnson	8f7a5decb6	Add DS_Store to gitignore	2011-05-25 17:28:24 -07:00
@@ -1 +1 @@
 .9.6
 .9.6.1