You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2015/07/20 15:01:33 UTC
android commit: CB-9382 [Android] Fix KeepRunning setting when Plugin
activity is showed. This closes #200
Repository: cordova-android
Updated Branches:
refs/heads/master 2fc86e283 -> 32b72756f
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/32b72756
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/32b72756
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/32b72756
Branch: refs/heads/master
Commit: 32b72756f384b470de0336127189f5f34a1439e8
Parents: 2fc86e2
Author: sgrebnov <v-...@microsoft.com>
Authored: Mon Jul 20 14:14:50 2015 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Mon Jul 20 16:02:21 2015 +0300
----------------------------------------------------------------------
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/32b72756/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 7a855af..5c3bc50 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -235,7 +235,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