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 2013/07/30 18:23:17 UTC

android commit: [CB-4013] Fixed loadUrlTimeoutValue preference.

Updated Branches:
  refs/heads/master 810df6104 -> 7cbe8f584


[CB-4013] Fixed loadUrlTimeoutValue preference.

Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/7cbe8f58
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/7cbe8f58
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/7cbe8f58

Branch: refs/heads/master
Commit: 7cbe8f584369a616630a63dc56391f8172d3e94e
Parents: 810df61
Author: Max Woghiren <ma...@gmail.com>
Authored: Tue Jul 30 12:21:50 2013 -0400
Committer: Max Woghiren <ma...@gmail.com>
Committed: Tue Jul 30 12:21:50 2013 -0400

----------------------------------------------------------------------
 framework/src/org/apache/cordova/CordovaWebView.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/7cbe8f58/framework/src/org/apache/cordova/CordovaWebView.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 49bcf2b..45d39ce 100755
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -425,7 +425,7 @@ public class CordovaWebView extends WebView {
         // Create a timeout timer for loadUrl
         final CordovaWebView me = this;
         final int currentLoadUrlTimeout = me.loadUrlTimeout;
-        final int loadUrlTimeoutValue = Integer.parseInt(this.getProperty("loadUrlTimeoutValue", "20000"));
+        final int loadUrlTimeoutValue = Integer.parseInt(this.getProperty("LoadUrlTimeoutValue", "20000"));
 
         // Timeout error method
         final Runnable loadError = new Runnable() {
@@ -621,7 +621,7 @@ public class CordovaWebView extends WebView {
      */
     private void loadConfiguration() {
  
-        if ("true".equals(this.getProperty("fullscreen", "false"))) {
+        if ("true".equals(this.getProperty("Fullscreen", "false"))) {
             this.cordova.getActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
             this.cordova.getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
         }
@@ -639,6 +639,7 @@ public class CordovaWebView extends WebView {
         if (bundle == null) {
             return defaultValue;
         }
+        name = name.toLowerCase(Locale.getDefault());
         Object p = bundle.get(name);
         if (p == null) {
             return defaultValue;