You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2015/09/23 21:58:22 UTC
[11/45] android commit: CB-9382 [Android] Fix KeepRunning setting
when Plugin activity is showed. This closes #200
CB-9382 [Android] Fix KeepRunning setting when Plugin activity is showed. This closes #200
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e1246698
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e1246698
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e1246698
Branch: refs/heads/5.0.x
Commit: e124669818c107b73abf57f97618172378278e3b
Parents: b20b2e7
Author: sgrebnov <v-...@microsoft.com>
Authored: Mon Jul 20 14:14:50 2015 +0300
Committer: Joe Bowser <bo...@apache.org>
Committed: Thu Aug 20 13:48:02 2015 -0700
----------------------------------------------------------------------
framework/src/org/apache/cordova/CordovaActivity.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e1246698/framework/src/org/apache/cordova/CordovaActivity.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaActivity.java b/framework/src/org/apache/cordova/CordovaActivity.java
index 8bed308..e446927 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -228,7 +228,10 @@ public class CordovaActivity extends Activity {
LOG.d(TAG, "Paused the activity.");
if (this.appView != null) {
- this.appView.handlePause(this.keepRunning);
+ // CB-9382 If there is an activity that started for result and main activity is waiting for callback
+ // result, we shoudn't stop WebView Javascript timers, as activity for result might be using them
+ boolean keepRunning = this.keepRunning || this.cordovaInterface.activityResultCallback != null;
+ this.appView.handlePause(keepRunning);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org