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

Merge branch 'master' into 4.0.x (CordovaBridge tweaks)

Browse Source 
Conflicts:
	framework/src/org/apache/cordova/CordovaActivity.java
This commit is contained in:
Andrew Grieve 2014-07-10 11:36:58 -04:00
commit b52fcb8aa9
1 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
framework/src/org/apache/cordova/CordovaBridge.java
View File

@ -33,7 +33,7 @@ public class CordovaBridge {
private static final String LOG_TAG = "CordovaBridge"; private static final String LOG_TAG = "CordovaBridge";
private PluginManager pluginManager; private PluginManager pluginManager;
private NativeToJsMessageQueue jsMessageQueue; private NativeToJsMessageQueue jsMessageQueue;
private volatile int bridgeSecret = -1; // written by UI thread, read by JS thread. private volatile int expectedBridgeSecret = -1; // written by UI thread, read by JS thread.
private String loadedUrl; private String loadedUrl;
public CordovaBridge(PluginManager pluginManager, NativeToJsMessageQueue jsMessageQueue) { public CordovaBridge(PluginManager pluginManager, NativeToJsMessageQueue jsMessageQueue) {
@ -41,23 +41,10 @@ public class CordovaBridge {
this.jsMessageQueue = jsMessageQueue; this.jsMessageQueue = jsMessageQueue;
} }
private final boolean checkBridgeEnabled(String action) {
if (!jsMessageQueue.isBridgeEnabled()) {
if (bridgeSecret == -1) {
Log.d(LOG_TAG, action + " call made before bridge was enabled.");
} else {
Log.d(LOG_TAG, "Ignoring " + action + " from previous page load.");
}
return false;
}
return true;
}
public String jsExec(int bridgeSecret, String service, String action, String callbackId, String arguments) throws JSONException, IllegalAccessException { public String jsExec(int bridgeSecret, String service, String action, String callbackId, String arguments) throws JSONException, IllegalAccessException {
if (!checkBridgeEnabled("exec()")) { if (!verifySecret("exec()", bridgeSecret)) {
return ""; return null;
} }
verifySecret(bridgeSecret);
// If the arguments weren't received, send a message back to JS. It will switch bridge modes and try again. See CB-2666. // If the arguments weren't received, send a message back to JS. It will switch bridge modes and try again. See CB-2666.
// We send a message meant specifically for this case. It starts with "@" so no other message can be encoded into the same string. // We send a message meant specifically for this case. It starts with "@" so no other message can be encoded into the same string.
if (arguments == null) { if (arguments == null) {
@ -70,7 +57,7 @@ public class CordovaBridge {
CordovaResourceApi.jsThread = Thread.currentThread(); CordovaResourceApi.jsThread = Thread.currentThread();
pluginManager.exec(service, action, callbackId, arguments); pluginManager.exec(service, action, callbackId, arguments);
String ret = ""; String ret = null;
if (!NativeToJsMessageQueue.DISABLE_EXEC_CHAINING) { if (!NativeToJsMessageQueue.DISABLE_EXEC_CHAINING) {
ret = jsMessageQueue.popAndEncode(false); ret = jsMessageQueue.popAndEncode(false);
} }
@ -84,33 +71,44 @@ public class CordovaBridge {
} }
public void jsSetNativeToJsBridgeMode(int bridgeSecret, int value) throws IllegalAccessException { public void jsSetNativeToJsBridgeMode(int bridgeSecret, int value) throws IllegalAccessException {
verifySecret(bridgeSecret); if (!verifySecret("setNativeToJsBridgeMode()", bridgeSecret)) {
return;
}
jsMessageQueue.setBridgeMode(value); jsMessageQueue.setBridgeMode(value);
} }
public String jsRetrieveJsMessages(int bridgeSecret, boolean fromOnlineEvent) throws IllegalAccessException { public String jsRetrieveJsMessages(int bridgeSecret, boolean fromOnlineEvent) throws IllegalAccessException {
if (!checkBridgeEnabled("retrieveJsMessages()")) { if (!verifySecret("retrieveJsMessages()", bridgeSecret)) {
return ""; return null;
} }
verifySecret(bridgeSecret);
return jsMessageQueue.popAndEncode(fromOnlineEvent); return jsMessageQueue.popAndEncode(fromOnlineEvent);
} }
private void verifySecret(int value) throws IllegalAccessException { private boolean verifySecret(String action, int bridgeSecret) throws IllegalAccessException {
if (bridgeSecret < 0 || value != bridgeSecret) { if (!jsMessageQueue.isBridgeEnabled()) {
if (bridgeSecret == -1) {
Log.d(LOG_TAG, action + " call made before bridge was enabled.");
} else {
Log.d(LOG_TAG, "Ignoring " + action + " from previous page load.");
}
return false;
}
// Bridge secret wrong and bridge not due to it being from the previous page.
if (expectedBridgeSecret < 0 || bridgeSecret != expectedBridgeSecret) {
throw new IllegalAccessException(); throw new IllegalAccessException();
} }
return true;
} }
/** Called on page transitions */ /** Called on page transitions */
void clearBridgeSecret() { void clearBridgeSecret() {
bridgeSecret = -1; expectedBridgeSecret = -1;
} }
/** Called by cordova.js to initialize the bridge. */ /** Called by cordova.js to initialize the bridge. */
int generateBridgeSecret() { int generateBridgeSecret() {
bridgeSecret = (int)(Math.random() * Integer.MAX_VALUE); expectedBridgeSecret = (int)(Math.random() * Integer.MAX_VALUE);
return bridgeSecret; return expectedBridgeSecret;
} }
public void reset(String loadedUrl) { public void reset(String loadedUrl) {