Updated Branches: refs/heads/master a17c7b9bb -> 934cf3216
CB-3064: One line fix for the error where the config wasn't being read. Will have to add doc step for CordovaWebView Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/934cf321 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/934cf321 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/934cf321 Branch: refs/heads/master Commit: 934cf3216377e9235ceb594238596dc6cc606397 Parents: a17c7b9 Author: Joe Bowser <[email protected]> Authored: Tue Apr 23 13:53:10 2013 -0700 Committer: Joe Bowser <[email protected]> Committed: Tue Apr 23 13:53:10 2013 -0700 ---------------------------------------------------------------------- framework/src/org/apache/cordova/DroidGap.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/934cf321/framework/src/org/apache/cordova/DroidGap.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java index bb895e2..3c6610f 100755 --- a/framework/src/org/apache/cordova/DroidGap.java +++ b/framework/src/org/apache/cordova/DroidGap.java @@ -679,8 +679,16 @@ public class DroidGap extends Activity implements CordovaInterface { */ protected void onResume() { super.onResume(); + //Reload the configuration + Config.init(this); LOG.d(TAG, "Resuming the App"); + + + //Code to test CB-3064 + String errorUrl = this.getStringProperty("errorUrl", null); + LOG.d(TAG, "CB-3064: The errorUrl is " + errorUrl); + if (this.activityState == ACTIVITY_STARTING) { this.activityState = ACTIVITY_RUNNING; return;
