From 141b8355ac7098b0391793a4d873f0488d4803ac Mon Sep 17 00:00:00 2001
From: Bryce Curtis <curtis.bryce@gmail.com>
Date: Thu, 3 Nov 2011 14:22:29 -0500
Subject: [PATCH] Don't fire resume upon init - only when returning from
 background.

Lifecycle behavior for PhoneGap app:
window.onload = loading html page
pause = html page entering background (not displayed)
resume = html page entering foreground (displayed)
window.onunload = leaving html page
---
 framework/assets/js/phonegap.js.base          | 19 -------------------
 framework/src/com/phonegap/DroidGap.java      |  4 ++--
 .../src/com/phonegap/api/PluginManager.java   |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/framework/assets/js/phonegap.js.base b/framework/assets/js/phonegap.js.base
index 0bf4bcfd..d9478325 100755
--- a/framework/assets/js/phonegap.js.base
+++ b/framework/assets/js/phonegap.js.base
@@ -284,18 +284,6 @@ PhoneGap.onPhoneGapInfoReady = new PhoneGap.Channel('onPhoneGapInfoReady');
  */
 PhoneGap.onPhoneGapConnectionReady = new PhoneGap.Channel('onPhoneGapConnectionReady');
 
-/**
- * onResume channel is fired when the PhoneGap native code
- * resumes.
- */
-PhoneGap.onResume = new PhoneGap.Channel('onResume');
-
-/**
- * onPause channel is fired when the PhoneGap native code
- * pauses.
- */
-PhoneGap.onPause = new PhoneGap.Channel('onPause');
-
 /**
  * onDestroy channel is fired when the PhoneGap native code
  * is destroyed.  It is used internally.
@@ -435,13 +423,6 @@ document.addEventListener = function(evt, handler, capture) {
     var e = evt.toLowerCase();
     if (e === 'deviceready') {
         PhoneGap.onDeviceReady.subscribeOnce(handler);
-    } else if (e === 'resume') {
-        PhoneGap.onResume.subscribe(handler);
-        if (PhoneGap.onDeviceReady.fired) {
-            PhoneGap.onResume.fire();
-        }
-    } else if (e === 'pause') {
-        PhoneGap.onPause.subscribe(handler);
     }
     else {
         // If subscribing to Android backbutton
diff --git a/framework/src/com/phonegap/DroidGap.java b/framework/src/com/phonegap/DroidGap.java
index c297704d..3db25181 100755
--- a/framework/src/com/phonegap/DroidGap.java
+++ b/framework/src/com/phonegap/DroidGap.java
@@ -730,7 +730,7 @@ public class DroidGap extends PhonegapActivity {
         }
 
         // Send pause event to JavaScript
-        this.appView.loadUrl("javascript:try{PhoneGap.onPause.fire();}catch(e){};"); 
+        this.appView.loadUrl("javascript:try{PhoneGap.fireDocumentEvent('pause');}catch(e){};");
 
         // Forward to plugins
         this.pluginManager.onPause(this.keepRunning);
@@ -771,7 +771,7 @@ public class DroidGap extends PhonegapActivity {
         }
 
         // Send resume event to JavaScript
-        this.appView.loadUrl("javascript:try{PhoneGap.onResume.fire();}catch(e){};");
+        this.appView.loadUrl("javascript:try{PhoneGap.fireDocumentEvent('resume');}catch(e){};");
 
         // Forward to plugins
         this.pluginManager.onResume(this.keepRunning || this.activityResultKeepRunning);
diff --git a/framework/src/com/phonegap/api/PluginManager.java b/framework/src/com/phonegap/api/PluginManager.java
index f3b8e4e0..6c782dfc 100755
--- a/framework/src/com/phonegap/api/PluginManager.java
+++ b/framework/src/com/phonegap/api/PluginManager.java
@@ -239,7 +239,6 @@ public final class PluginManager {
 				this.plugins.put(className, plugin);
 				plugin.setContext(this.ctx);
 				plugin.setView(this.app);
-				plugin.onResume(true);
 				return plugin;
 			}
     	} catch (Exception e) {