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

Add PluginManager.setPluginEntries, delete setPluginWhitelist

Browse Source
This commit is contained in:
Andrew Grieve 2014-07-10 16:39:46 -04:00
parent a4f6d9f6e7
commit b277202838
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,8 @@
*/
package org.apache.cordova;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import org.apache.cordova.CordovaWebView;
import org.apache.cordova.CallbackContext;
@ -51,20 +50,26 @@ public class PluginManager {
private final CordovaInterface ctx;
private final CordovaWebView app;
private Set<String> pluginIdWhitelist;
public PluginManager(CordovaWebView cordovaWebView, CordovaInterface cordova, List<PluginEntry> pluginEntries) {
public PluginManager(CordovaWebView cordovaWebView, CordovaInterface cordova, Collection<PluginEntry> pluginEntries) {
this.ctx = cordova;
this.app = cordovaWebView;
setPluginEntries(pluginEntries);
}
public Collection<PluginEntry> getPluginEntries() {
return entries.values();
}
public void setPluginEntries(Collection<PluginEntry> pluginEntries) {
this.onPause(false);
this.onDestroy();
this.clearPluginObjects();
entries.clear();
for (PluginEntry entry : pluginEntries) {
addService(entry);
}
}
public void setPluginIdWhitelist(Set<String> pluginIdWhitelist) {
this.pluginIdWhitelist = pluginIdWhitelist;
}
/**
* Init when loading a new HTML page into webview.
*/
@ -91,9 +96,7 @@ public class PluginManager {
public void startupPlugins() {
for (PluginEntry entry : this.entries.values()) {
if (entry.onload) {
if (pluginIdWhitelist == null || pluginIdWhitelist.contains(entry.service)) {
entry.createPlugin(this.app, this.ctx);
}
entry.createPlugin(this.app, this.ctx);
}
}
}
@ -160,11 +163,7 @@ public class PluginManager {
}
CordovaPlugin plugin = entry.plugin;
if (plugin == null) {
if (pluginIdWhitelist == null || pluginIdWhitelist.contains(entry.service)) {
plugin = entry.createPlugin(this.app, this.ctx);
} else {
Log.e(TAG, "Attempted to access non-whitelisted plugin: " + entry.service);
}
plugin = entry.createPlugin(this.app, this.ctx);
}
return plugin;
}