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

Merge pull request #435 from richturner/master

Browse Source 
CB-13975: (android) Fix to fire pause event when cdvStartInBackground=true
This commit is contained in:
Joe Bowser 2018-03-27 13:50:26 -07:00 committed by GitHub
commit b8530a6b70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
framework/src/org/apache/cordova/CoreAndroid.java
View File

@ -43,6 +43,7 @@ public class CoreAndroid extends CordovaPlugin {
private BroadcastReceiver telephonyReceiver; private BroadcastReceiver telephonyReceiver;
private CallbackContext messageChannel; private CallbackContext messageChannel;
private PluginResult pendingResume; private PluginResult pendingResume;
private PluginResult pendingPause;
private final Object messageChannelLock = new Object(); private final Object messageChannelLock = new Object();
/** /**
@ -113,6 +114,10 @@ public class CoreAndroid extends CordovaPlugin {
else if (action.equals("messageChannel")) { else if (action.equals("messageChannel")) {
synchronized(messageChannelLock) { synchronized(messageChannelLock) {
messageChannel = callbackContext; messageChannel = callbackContext;
if (pendingPause != null) {
sendEventMessage(pendingPause);
pendingPause = null;
}
if (pendingResume != null) { if (pendingResume != null) {
sendEventMessage(pendingResume); sendEventMessage(pendingResume);
pendingResume = null; pendingResume = null;
@ -321,7 +326,19 @@ public class CoreAndroid extends CordovaPlugin {
} catch (JSONException e) { } catch (JSONException e) {
LOG.e(TAG, "Failed to create event message", e); LOG.e(TAG, "Failed to create event message", e);
} }
sendEventMessage(new PluginResult(PluginResult.Status.OK, obj)); PluginResult result = new PluginResult(PluginResult.Status.OK, obj);
if (messageChannel == null) {
LOG.i(TAG, "Request to send event before messageChannel initialised: " + action);
if ("pause".equals(action)) {
pendingPause = result;
} else if ("resume".equals(action)) {
// When starting normally onPause then onResume is called
pendingPause = null;
}
} else {
sendEventMessage(result);
}
} }
private void sendEventMessage(PluginResult payload) { private void sendEventMessage(PluginResult payload) {