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

Merge branch 'master' into 4.0.x (PluginEntry refactor)

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/PluginEntry.java
	framework/src/org/apache/cordova/PluginManager.java
	test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
This commit is contained in:
Andrew Grieve 2014-07-14 14:18:10 -04:00
commit e2b3f76a10
4 changed files with 99 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/lib/check_reqs.js
View File

@ -37,6 +37,10 @@ module.exports.get_target = function() {
// this is called on the project itself, and can support Google APIs AND Vanilla Android
var target = shell.grep(/target=android-[\d+]/, path.join(ROOT, 'project.properties')) ||
shell.grep(/target=Google Inc.:Google APIs:[\d+]/, path.join(ROOT, 'project.properties'));
if(target == "" || !target) {
// Try Google Glass APIs
target = shell.grep(/target=Google Inc.:Glass Development Kit Preview:[\d+]/, path.join(ROOT, 'project.properties'));
}
return target.split('=')[1].replace('\n', '').replace('\r', '');
}
}
@ -99,10 +103,10 @@ module.exports.check_android = function() {
}
return Q();
}, function(stderr) {
if (stderr.match(/command\snot\sfound/)) {
if (stderr.match(/command\snot\sfound/) || stderr.match(/is not recognized as an internal or external command/)) {
return Q.reject(new Error('The command \"android\" failed. Make sure you have the latest Android SDK installed, and the \"android\" command (inside the tools/ folder) is added to your path.'));
} else {
return Q.reject(new Error('An error occurred while listing Android targets'));
return Q.reject(new Error('An error occurred while listing Android targets. Error: ' + stderr ));
}
});
}

75
framework/src/org/apache/cordova/PluginEntry.java
View File

@ -18,11 +18,8 @@
*/
package org.apache.cordova;
import org.apache.cordova.CordovaWebView;
import org.apache.cordova.CordovaInterface;
import org.apache.cordova.CordovaPlugin;
/**
* This class represents a service entry object.
*/
@ -31,32 +28,28 @@ public class PluginEntry {
/**
* The name of the service that this plugin implements
*/
public String service = "";
public String service;
/**
* The plugin class name that implements the service.
*/
public String pluginClass = "";
public String pluginClass;
/**
* The plugin object.
* Plugin objects are only created when they are called from JavaScript. (see PluginManager.exec)
* The exception is if the onload flag is set, then they are created when PluginManager is initialized.
* The pre-instantiated plugin to use for this entry.
*/
public CordovaPlugin plugin = null;
public CordovaPlugin plugin;
/**
* Flag that indicates the plugin object should be created when PluginManager is initialized.
*/
public boolean onload = false;
public boolean onload;
/**
* @param service The name of the service
* @param plugin The plugin associated with this entry
* Constructs with a CordovaPlugin already instantiated.
*/
public PluginEntry(String service, CordovaPlugin plugin) {
this(service, plugin.getClass().getName(), true);
this.plugin = plugin;
this(service, plugin.getClass().getName(), true, plugin);
}
/**
@ -65,57 +58,13 @@ public class PluginEntry {
* @param onload Create plugin object when HTML page is loaded
*/
public PluginEntry(String service, String pluginClass, boolean onload) {
this(service, pluginClass, onload, null);
}
private PluginEntry(String service, String pluginClass, boolean onload, CordovaPlugin plugin) {
this.service = service;
this.pluginClass = pluginClass;
this.onload = onload;
}
/**
* Create plugin object.
* If plugin is already created, then just return it.
*
* @return The plugin object
*/
public CordovaPlugin createPlugin(CordovaWebView webView, CordovaInterface ctx) {
if (this.plugin != null) {
return this.plugin;
}
try {
Class<?> c = getClassByName(this.pluginClass);
if (isCordovaPlugin(c)) {
this.plugin = (CordovaPlugin) c.newInstance();
this.plugin.privateInitialize(ctx, webView, webView.getPreferences());
return plugin;
}
} catch (Exception e) {
e.printStackTrace();
System.out.println("Error adding plugin " + this.pluginClass + ".");
}
return null;
}
/**
* Get the class.
*
* @param clazz
* @return a reference to the named class
* @throws ClassNotFoundException
*/
private Class<?> getClassByName(final String clazz) throws ClassNotFoundException {
Class<?> c = null;
if ((clazz != null) && !("".equals(clazz))) {
c = Class.forName(clazz);
}
return c;
}
/**
* Returns whether the given class extends CordovaPlugin.
*/
private boolean isCordovaPlugin(Class<?> c) {
if (c != null) {
return CordovaPlugin.class.isAssignableFrom(c);
}
return false;
this.plugin = plugin;
}
}

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

@ -45,7 +45,8 @@ public class PluginManager {
private static final int SLOW_EXEC_WARNING_THRESHOLD = Debug.isDebuggerConnected() ? 60 : 16;
// List of service entries
private final HashMap<String, PluginEntry> entries = new HashMap<String, PluginEntry>();
private final HashMap<String, CordovaPlugin> pluginMap = new HashMap<String, CordovaPlugin>();
private final HashMap<String, PluginEntry> entryMap = new HashMap<String, PluginEntry>();
private final CordovaInterface ctx;
private final CordovaWebView app;
@ -57,14 +58,14 @@ public class PluginManager {
}
public Collection<PluginEntry> getPluginEntries() {
return entries.values();
return entryMap.values();
}
public void setPluginEntries(Collection<PluginEntry> pluginEntries) {
this.onPause(false);
this.onDestroy();
this.clearPluginObjects();
entries.clear();
pluginMap.clear();
entryMap.clear();
for (PluginEntry entry : pluginEntries) {
addService(entry);
}
@ -73,30 +74,31 @@ public class PluginManager {
/**
* Init when loading a new HTML page into webview.
*/
@Deprecated // Should not be exposed as public.
public void init() {
LOG.d(TAG, "init()");
this.onPause(false);
this.onDestroy();
this.clearPluginObjects();
pluginMap.clear();
this.startupPlugins();
}
/**
* Delete all plugin objects.
*/
@Deprecated // Should not be exposed as public.
public void clearPluginObjects() {
for (PluginEntry entry : this.entries.values()) {
entry.plugin = null;
}
pluginMap.clear();
}
/**
* Create plugins objects that have onload set.
*/
@Deprecated // Should not be exposed as public.
public void startupPlugins() {
for (PluginEntry entry : this.entries.values()) {
for (PluginEntry entry : entryMap.values()) {
if (entry.onload) {
entry.createPlugin(this.app, this.ctx);
getPlugin(entry.service);
}
}
}
@ -157,15 +159,21 @@ public class PluginManager {
* @return CordovaPlugin or null
*/
public CordovaPlugin getPlugin(String service) {
PluginEntry entry = this.entries.get(service);
if (entry == null) {
return null;
CordovaPlugin ret = pluginMap.get(service);
if (ret == null) {
PluginEntry pe = entryMap.get(service);
if (pe == null) {
return null;
}
if (pe.plugin != null) {
ret = pe.plugin;
} else {
ret = instantiatePlugin(pe.pluginClass);
}
ret.privateInitialize(ctx, app, app.getPreferences());
pluginMap.put(service, ret);
}
CordovaPlugin plugin = entry.plugin;
if (plugin == null) {
plugin = entry.createPlugin(this.app, this.ctx);
}
return plugin;
return ret;
}
/**
@ -187,7 +195,11 @@ public class PluginManager {
* @param entry The plugin entry
*/
public void addService(PluginEntry entry) {
this.entries.put(entry.service, entry);
this.entryMap.put(entry.service, entry);
if (entry.plugin != null) {
entry.plugin.privateInitialize(ctx, app, app.getPreferences());
pluginMap.put(entry.service, entry.plugin);
}
}
/**
@ -195,11 +207,10 @@ public class PluginManager {
*
* @param multitasking Flag indicating if multitasking is turned on for app
*/
@Deprecated // Should not be public
public void onPause(boolean multitasking) {
for (PluginEntry entry : this.entries.values()) {
if (entry.plugin != null) {
entry.plugin.onPause(multitasking);
}
for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onPause(multitasking);
}
}
@ -208,22 +219,20 @@ public class PluginManager {
*
* @param multitasking Flag indicating if multitasking is turned on for app
*/
@Deprecated // Should not be public
public void onResume(boolean multitasking) {
for (PluginEntry entry : this.entries.values()) {
if (entry.plugin != null) {
entry.plugin.onResume(multitasking);
}
for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onResume(multitasking);
}
}
/**
* The final call you receive before your activity is destroyed.
*/
@Deprecated // Should not be public
public void onDestroy() {
for (PluginEntry entry : this.entries.values()) {
if (entry.plugin != null) {
entry.plugin.onDestroy();
}
for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onDestroy();
}
}
@ -239,12 +248,10 @@ public class PluginManager {
if (obj != null) {
return obj;
}
for (PluginEntry entry : this.entries.values()) {
if (entry.plugin != null) {
obj = entry.plugin.onMessage(id, data);
if (obj != null) {
return obj;
}
for (CordovaPlugin plugin : this.pluginMap.values()) {
obj = plugin.onMessage(id, data);
if (obj != null) {
return obj;
}
}
return null;
@ -253,11 +260,10 @@ public class PluginManager {
/**
* Called when the activity receives a new intent.
*/
@Deprecated // Should not be public
public void onNewIntent(Intent intent) {
for (PluginEntry entry : this.entries.values()) {
if (entry.plugin != null) {
entry.plugin.onNewIntent(intent);
}
for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onNewIntent(intent);
}
}
@ -267,16 +273,16 @@ public class PluginManager {
* @param url The URL that is being changed to.
* @return Return false to allow the URL to load, return true to prevent the URL from loading.
*/
@Deprecated // Should not be public
public boolean onOverrideUrlLoading(String url) {
// Deprecated way to intercept URLs. (process <url-filter> tags).
// Instead, plugins should not include <url-filter> and instead ensure
// that they are loaded before this function is called (either by setting
// the onload <param> or by making an exec() call to them)
for (PluginEntry entry : this.entries.values()) {
if (entry.plugin != null) {
if (entry.plugin.onOverrideUrlLoading(url)) {
return true;
}
for (PluginEntry entry : this.entryMap.values()) {
CordovaPlugin plugin = pluginMap.get(entry.service);
if (plugin != null && plugin.onOverrideUrlLoading(url)) {
return true;
}
}
return false;
@ -285,23 +291,40 @@ public class PluginManager {
/**
* Called when the app navigates or refreshes.
*/
@Deprecated // Should not be public
public void onReset() {
for (PluginEntry entry : this.entries.values()) {
if (entry.plugin != null) {
entry.plugin.onReset();
}
for (CordovaPlugin plugin : this.pluginMap.values()) {
plugin.onReset();
}
}
Uri remapUri(Uri uri) {
for (PluginEntry entry : this.entries.values()) {
if (entry.plugin != null) {
Uri ret = entry.plugin.remapUri(uri);
if (ret != null) {
return ret;
}
for (CordovaPlugin plugin : this.pluginMap.values()) {
Uri ret = plugin.remapUri(uri);
if (ret != null) {
return ret;
}
}
return null;
}
/**
* Create a plugin based on class name.
*/
private CordovaPlugin instantiatePlugin(String className) {
CordovaPlugin ret = null;
try {
Class<?> c = null;
if ((className != null) && !("".equals(className))) {
c = Class.forName(className);
}
if (c != null & CordovaPlugin.class.isAssignableFrom(c)) {
ret = (CordovaPlugin) c.newInstance();
}
} catch (Exception e) {
e.printStackTrace();
System.out.println("Error adding plugin " + className + ".");
}
return ret;
}
}

3
test/src/org/apache/cordova/test/CordovaWebViewTestActivity.java
View File

@ -46,6 +46,7 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
setContentView(R.layout.main);
cordovaWebView = (CordovaWebView) findViewById(R.id.cordovaWebView);
Config.init(this);
cordovaWebView.init(this,
Config.getPluginEntries(), Config.getWhitelist(), Config.getPreferences());
@ -100,4 +101,4 @@ public class CordovaWebViewTestActivity extends Activity implements CordovaInter
cordovaWebView.handleDestroy();
}
}
}
}