From 5f1cda07e707b39cff1c06e7635d25a11b502eb1 Mon Sep 17 00:00:00 2001 From: Joe Bowser Date: Tue, 23 Oct 2012 10:46:53 -0700 Subject: [PATCH] Cleaning up code, because negating string comparisons is confusing if the string itself is called false. Also clarified the deprecation message to match the Cordova policy that we agreed on for deprecation changes --- framework/src/org/apache/cordova/CordovaWebView.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java index e55d544f..500ba523 100755 --- a/framework/src/org/apache/cordova/CordovaWebView.java +++ b/framework/src/org/apache/cordova/CordovaWebView.java @@ -730,13 +730,13 @@ public class CordovaWebView extends WebView { } } - // Init preferences - this.useBrowserHistory = !"false".equals(this.getProperty("useBrowserHistory", "true")); - if (!this.useBrowserHistory) { - // Deprecated in Cordova 2.2.0. - Log.w(TAG, "useBrowserHistory=false is deprecated. Use history.back() instead of navigator.app.backHistory()."); + if("false".equals(this.getProperty("useBrowserHistory", "true"))) + { + //Switch back to the old browser history and state the six month policy + this.useBrowserHistory = false; + Log.w(TAG, "useBrowserHistory=false is deprecated. We will be removing this feature entirely in six months. Please use the browser history and use history.back()."); } - + 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);