Merge branch 'master' of github.com:phonegap/phonegap-android into keyboard

framework/src/com/phonegap/DroidGap.java

@@ -678,9 +678,6 @@ public class DroidGap extends PhonegapActivity {
         	// Forward to plugins
         	this.pluginManager.onDestroy();
 
-    	if (this.callbackServer != null) {
-    		this.callbackServer.destroy();
-    	}
         }
     }
 
@@ -1073,7 +1070,9 @@ public class DroidGap extends PhonegapActivity {
         	// Try firing the onNativeReady event in JS. If it fails because the JS is
         	// not loaded yet then just set a flag so that the onNativeReady can be fired
         	// from the JS side when the JS gets to that code.
+        	if (!url.equals("about:blank")) {
         		appView.loadUrl("javascript:try{ PhoneGap.onNativeReady.fire();}catch(e){_nativeReady = true;}");
+        	}
 
         	// Make app view visible
         	appView.setVisibility(View.VISIBLE);
@@ -1089,6 +1088,13 @@ public class DroidGap extends PhonegapActivity {
     			this.ctx.clearHistory = false;
     			this.ctx.appView.clearHistory();
     		}
+    		
+    		// Shutdown if blank loaded
+    		if (url.equals("about:blank")) {
+    			if (this.ctx.callbackServer != null) {
+    				this.ctx.callbackServer.destroy();
+    			}
+    		}
         }
         
         /**

framework/src/com/phonegap/NetworkManager.java

@@ -59,11 +59,13 @@ public class NetworkManager extends Plugin {
 
 	ConnectivityManager sockMan;
 	TelephonyManager telephonyManager;
+	BroadcastReceiver receiver;
 	
 	/**
 	 * Constructor.
 	 */
 	public NetworkManager()	{
+		this.receiver = null;
 	}
 
 	/**
@@ -76,16 +78,21 @@ public class NetworkManager extends Plugin {
 		super.setContext(ctx);
 		this.sockMan = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE);		
 		this.telephonyManager = ((TelephonyManager) ctx.getSystemService(Context.TELEPHONY_SERVICE));
+		this.connectionCallbackId = null;
 
 		// We need to listen to connectivity events to update navigator.connection
 		IntentFilter intentFilter = new IntentFilter() ;
 		intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
-		ctx.registerReceiver(new BroadcastReceiver() {
+		if (this.receiver == null) {
+			this.receiver = new BroadcastReceiver() {
 				@Override
 				public void onReceive(Context context, Intent intent) {				
 					updateConnectionInfo((NetworkInfo) intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO));				
 				}
-		}, intentFilter);
+			};
+			ctx.registerReceiver(this.receiver, intentFilter);
+		}
+
 	}
 	
 	/**
@@ -136,6 +143,19 @@ public class NetworkManager extends Plugin {
 		return false;
 	}
 	
+	/**
+	 * Stop network receiver.
+	 */
+	public void onDestroy() {
+		if (this.receiver != null) {
+			try {
+				this.ctx.unregisterReceiver(this.receiver);
+			} catch (Exception e) {
+				System.out.println("Error unregistering network receiver: " + e.getMessage());
+			}
+		}
+	}
+
     //--------------------------------------------------------------------------
     // LOCAL METHODS
     //--------------------------------------------------------------------------