You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2014/08/04 19:45:31 UTC
[2/6] android commit: Update the errorurl to no longer use intents
Update the errorurl to no longer use intents
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2ab81bc5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2ab81bc5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2ab81bc5
Branch: refs/heads/3.5.x
Commit: 2ab81bc5aeb575fef3657cf48a671607e81ca37d
Parents: 40acaa9
Author: Joe Bowser <bo...@apache.org>
Authored: Tue Jun 24 12:57:46 2014 -0700
Committer: Marcel Kinard <cm...@gmail.com>
Committed: Mon Jul 28 16:30:29 2014 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/Config.java | 15 ++++++++++-----
.../src/org/apache/cordova/CordovaActivity.java | 2 +-
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2ab81bc5/framework/src/org/apache/cordova/Config.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/Config.java b/framework/src/org/apache/cordova/Config.java
index 31a1370..5da0856 100644
--- a/framework/src/org/apache/cordova/Config.java
+++ b/framework/src/org/apache/cordova/Config.java
@@ -20,21 +20,16 @@
package org.apache.cordova;
import java.io.IOException;
-
import java.util.Locale;
-
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.cordova.LOG;
-
import org.xmlpull.v1.XmlPullParserException;
import android.app.Activity;
-
import android.content.res.XmlResourceParser;
import android.graphics.Color;
-
import android.util.Log;
public class Config {
@@ -44,6 +39,8 @@ public class Config {
private Whitelist whitelist = new Whitelist();
private String startUrl;
+ private static String errorUrl;
+
private static Config self = null;
public static void init(Activity action) {
@@ -156,6 +153,10 @@ public class Config {
boolean value = xml.getAttributeValue(null, "value").equals("true");
action.getIntent().putExtra(name, value);
}
+ else if(name.equalsIgnoreCase("errorurl"))
+ {
+ errorUrl = xml.getAttributeValue(null, "value");
+ }
else
{
String value = xml.getAttributeValue(null, "value");
@@ -230,4 +231,8 @@ public class Config {
}
return self.startUrl;
}
+
+ public static String getErrorUrl() {
+ return errorUrl;
+ }
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2ab81bc5/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 9f8b020..4d2a289 100755
--- a/framework/src/org/apache/cordova/CordovaActivity.java
+++ b/framework/src/org/apache/cordova/CordovaActivity.java
@@ -715,7 +715,7 @@ public class CordovaActivity extends Activity implements CordovaInterface {
//Code to test CB-3064
- String errorUrl = this.getStringProperty("ErrorUrl", null);
+ String errorUrl = Config.getErrorUrl();
LOG.d(TAG, "CB-3064: The errorUrl is " + errorUrl);
if (this.activityState == ACTIVITY_STARTING) {