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

CB-6047 Fix online sometimes getting in a bad state on page transitions.

Browse Source 
The online bridge toggles between on & off. Turns out that starting with
Android 4.3, navigation resets the online state, so the code had a 50/50
chance of being caught in the wrong state.

We now forcefully reset the online state on page transitions.
This commit is contained in:
Andrew Grieve 2014-02-26 20:23:07 -05:00
parent 5fb83e7f52
commit a2f8c9c75b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
framework/src/org/apache/cordova/NativeToJsMessageQueue.java
View File

@ -102,7 +102,8 @@ public class NativeToJsMessageQueue {
synchronized (this) {
activeListenerIndex = value;
BridgeMode activeListener = registeredListeners[value];
if (!paused && !queue.isEmpty() && activeListener != null) {
activeListener.reset();
if (!paused && !queue.isEmpty()) {
activeListener.onNativeToJsMessageAvailable();
}
}
@ -117,6 +118,7 @@ public class NativeToJsMessageQueue {
synchronized (this) {
queue.clear();
setBridgeMode(DEFAULT_BRIDGE_MODE);
registeredListeners[activeListenerIndex].reset();
}
}
@ -249,7 +251,7 @@ public class NativeToJsMessageQueue {
private void enqueueMessage(JsMessage message) {
synchronized (this) {
queue.add(message);
if (!paused && registeredListeners[activeListenerIndex] != null) {
if (!paused) {
registeredListeners[activeListenerIndex].onNativeToJsMessageAvailable();
}
}
@ -264,7 +266,7 @@ public class NativeToJsMessageQueue {
paused = value;
if (!value) {
synchronized (this) {
if (!queue.isEmpty() && registeredListeners[activeListenerIndex] != null) {
if (!queue.isEmpty()) {
registeredListeners[activeListenerIndex].onNativeToJsMessageAvailable();
}
}
@ -278,6 +280,7 @@ public class NativeToJsMessageQueue {
private abstract class BridgeMode {
abstract void onNativeToJsMessageAvailable();
void notifyOfFlush(boolean fromOnlineEvent) {}
void reset() {}
}
/** Uses JS polls for messages on a timer.. */
@ -304,7 +307,7 @@ public class NativeToJsMessageQueue {
/** Uses online/offline events to tell the JS when to poll for messages. */
private class OnlineEventsBridgeMode extends BridgeMode {
boolean online = false;
private boolean online;
final Runnable runnable = new Runnable() {
public void run() {
if (!queue.isEmpty()) {
@ -312,7 +315,8 @@ public class NativeToJsMessageQueue {
}
}
};
OnlineEventsBridgeMode() {
@Override void reset() {
online = false;
webView.setNetworkAvailable(true);
}
@Override void onNativeToJsMessageAvailable() {