Merge branch 'master' into 4.0.x (gradle java 6 & PluginManager race fix)

bin/templates/cordova/lib/plugin-build.gradle

@@ -40,8 +40,8 @@ android {
     publishNonDefault true
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_6
     }
 
     sourceSets {

bin/templates/project/build.gradle

@@ -87,8 +87,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_6
     }
 
     if (System.env.RELEASE_SIGNING_PROPERTIES_FILE) {

framework/build.gradle

@@ -45,8 +45,8 @@ android {
     publishNonDefault true
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_6
     }
 
     sourceSets {

framework/src/org/apache/cordova/PluginManager.java

@@ -87,8 +87,12 @@ public class PluginManager {
      */
     private void startupPlugins() {
         for (PluginEntry entry : entryMap.values()) {
+            // Add a null entry to for each non-startup plugin to avoid ConcurrentModificationException
+            // When iterating plugins.
             if (entry.onload) {
                 getPlugin(entry.service);
+            } else {
+                pluginMap.put(entry.service, null);
             }
         }
     }
@@ -199,9 +203,11 @@ public class PluginManager {
      */
     public void onPause(boolean multitasking) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null) {
                 plugin.onPause(multitasking);
             }
         }
+    }
 
     /**
      * Called when the activity will start interacting with the user.
@@ -210,18 +216,22 @@ public class PluginManager {
      */
     public void onResume(boolean multitasking) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null) {
                 plugin.onResume(multitasking);
             }
         }
+    }
 
     /**
      * The final call you receive before your activity is destroyed.
      */
     public void onDestroy() {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null) {
                 plugin.onDestroy();
             }
         }
+    }
 
     /**
      * Send a message to all plugins.
@@ -236,11 +246,13 @@ public class PluginManager {
             return obj;
         }
         for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null) {
                 obj = plugin.onMessage(id, data);
                 if (obj != null) {
                     return obj;
                 }
             }
+        }
         return null;
     }
 
@@ -249,9 +261,11 @@ public class PluginManager {
      */
     public void onNewIntent(Intent intent) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null) {
                 plugin.onNewIntent(intent);
             }
         }
+    }
 
     /**
      * Called when the URL of the webview changes.
@@ -278,17 +292,21 @@ public class PluginManager {
      */
     public void onReset() {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null) {
                 plugin.onReset();
             }
         }
+    }
 
     Uri remapUri(Uri uri) {
         for (CordovaPlugin plugin : this.pluginMap.values()) {
+            if (plugin != null) {
                 Uri ret = plugin.remapUri(uri);
                 if (ret != null) {
                     return ret;
                 }
             }
+        }
         return null;
     }