From 7bc0d624acd8c09f18b8fe72b5cd29ed1285e2e7 Mon Sep 17 00:00:00 2001
From: Joe Bowser <joe.bowser@nitobi.com>
Date: Fri, 24 Jun 2011 14:08:26 -0700
Subject: [PATCH] Fixing conflict

---
 framework/src/com/phonegap/DroidGap.java      | 37 ++++++++++++-------
 framework/src/com/phonegap/api/Plugin.java    |  6 +++
 .../src/com/phonegap/api/PluginManager.java   | 11 ++++++
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index 93dbe552..d3984fa3 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -12,12 +12,10 @@ import org.json.JSONException;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.widget.EditText;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
-import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.media.AudioManager;
@@ -30,19 +28,21 @@ 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.WebChromeClient;
-import android.webkit.JsPromptResult;
 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.PhonegapActivity;
 import com.phonegap.api.Plugin;
 import com.phonegap.api.PluginManager;
-import com.phonegap.api.PhonegapActivity;
 
 /**
  * This class is the main Android activity that represents the PhoneGap
@@ -616,17 +616,28 @@ public class DroidGap extends PhonegapActivity {
        	// Send pause event to JavaScript
        	this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};"); 
 
+      	// Forward to plugins
+      	this.pluginManager.onPause();
+
         // If app doesn't want to run in background
         if (!this.keepRunning) {
-        	
-        	// Forward to plugins
-        	this.pluginManager.onPause();
 
         	// 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. 
@@ -640,6 +651,9 @@ public class DroidGap extends PhonegapActivity {
        	// Send resume event to JavaScript
        	this.appView.loadUrl("javascript:try{PhoneGap.onResume.fire();}catch(e){};");
 
+      	// Forward to plugins
+      	this.pluginManager.onResume();
+
         // If app doesn't want to run in background
         if (!this.keepRunning || this.activityResultKeepRunning) {
 
@@ -649,9 +663,6 @@ public class DroidGap extends PhonegapActivity {
         		this.activityResultKeepRunning = false;
         	}
 
-        	// Forward to plugins
-        	this.pluginManager.onResume();
-
         	// Resume JavaScript timers (including setInterval)
         	this.appView.resumeTimers();
         }
diff --git a/framework/src/com/phonegap/api/Plugin.java b/framework/src/com/phonegap/api/Plugin.java
index a527159a..39da4b89 100755
--- a/framework/src/com/phonegap/api/Plugin.java
+++ b/framework/src/com/phonegap/api/Plugin.java
@@ -74,6 +74,12 @@ public abstract class Plugin implements IPlugin {
     public void onResume() {
     }
     
+    /**
+     * Called when the activity receives a new intent. 
+     */
+	public void onNewIntent(Intent intent) {
+	}
+    
     /**
      * The final call you receive before your activity is destroyed. 
      */
diff --git a/framework/src/com/phonegap/api/PluginManager.java b/framework/src/com/phonegap/api/PluginManager.java
index ad1cf20b..616ee856 100755
--- a/framework/src/com/phonegap/api/PluginManager.java
+++ b/framework/src/com/phonegap/api/PluginManager.java
@@ -13,6 +13,7 @@ import java.util.Map.Entry;
 import org.json.JSONArray;
 import org.json.JSONException;
 
+import android.content.Intent;
 import android.webkit.WebView;
 
 /**
@@ -265,4 +266,14 @@ public final class PluginManager {
     		plugin.onDestroy();
     	}
     }
+    
+    public void onNewIntent(Intent intent) {
+    	java.util.Set<Entry<String,Plugin>> s = this.plugins.entrySet();
+    	java.util.Iterator<Entry<String,Plugin>> it = s.iterator();
+    	while(it.hasNext()) {
+    		Entry<String,Plugin> entry = it.next();
+    		Plugin plugin = entry.getValue();
+    		plugin.onNewIntent(intent);
+    	}
+    }
 }
\ No newline at end of file