github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-01 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Grieve 2014-11-26 11:47:24 -05:00
commit e597f98c62
4 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/templates/cordova/lib/plugin-build.gradle
View File

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

4
bin/templates/project/build.gradle
View File

@ -87,8 +87,8 @@ android {
} }
compileOptions { 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) { if (System.env.RELEASE_SIGNING_PROPERTIES_FILE) {

4
framework/build.gradle
View File

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

40
framework/src/org/apache/cordova/PluginManager.java
View File

@ -87,8 +87,12 @@ public class PluginManager {
*/ */
private void startupPlugins() { private void startupPlugins() {
for (PluginEntry entry : entryMap.values()) { for (PluginEntry entry : entryMap.values()) {
// Add a null entry to for each non-startup plugin to avoid ConcurrentModificationException
// When iterating plugins.
if (entry.onload) { if (entry.onload) {
getPlugin(entry.service); getPlugin(entry.service);
} else {
pluginMap.put(entry.service, null);
} }
} }
} }
@ -199,7 +203,9 @@ public class PluginManager {
*/ */
public void onPause(boolean multitasking) { public void onPause(boolean multitasking) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onPause(multitasking); if (plugin != null) {
plugin.onPause(multitasking);
}
} }
} }
@ -210,7 +216,9 @@ public class PluginManager {
*/ */
public void onResume(boolean multitasking) { public void onResume(boolean multitasking) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onResume(multitasking); if (plugin != null) {
plugin.onResume(multitasking);
}
} }
} }
@ -219,7 +227,9 @@ public class PluginManager {
*/ */
public void onDestroy() { public void onDestroy() {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onDestroy(); if (plugin != null) {
plugin.onDestroy();
}
} }
} }
@ -236,9 +246,11 @@ public class PluginManager {
return obj; return obj;
} }
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
obj = plugin.onMessage(id, data); if (plugin != null) {
if (obj != null) { obj = plugin.onMessage(id, data);
return obj; if (obj != null) {
return obj;
}
} }
} }
return null; return null;
@ -249,7 +261,9 @@ public class PluginManager {
*/ */
public void onNewIntent(Intent intent) { public void onNewIntent(Intent intent) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onNewIntent(intent); if (plugin != null) {
plugin.onNewIntent(intent);
}
} }
} }
@ -278,15 +292,19 @@ public class PluginManager {
*/ */
public void onReset() { public void onReset() {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onReset(); if (plugin != null) {
plugin.onReset();
}
} }
} }
Uri remapUri(Uri uri) { Uri remapUri(Uri uri) {
for (CordovaPlugin plugin : this.pluginMap.values()) { for (CordovaPlugin plugin : this.pluginMap.values()) {
Uri ret = plugin.remapUri(uri); if (plugin != null) {
if (ret != null) { Uri ret = plugin.remapUri(uri);
return ret; if (ret != null) {
return ret;
}
} }
} }
return null; return null;