Repository: cordova-android Updated Branches: refs/heads/pluggable_webview 955da2e36 -> e595c313a
Use correct client object in recent versions of android again Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/e595c313 Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/e595c313 Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/e595c313 Branch: refs/heads/pluggable_webview Commit: e595c313a1c45a221199868cbdca1e2d357ed955 Parents: 955da2e Author: Ian Clelland <[email protected]> Authored: Fri May 2 10:29:53 2014 -0400 Committer: Ian Clelland <[email protected]> Committed: Fri May 2 10:29:53 2014 -0400 ---------------------------------------------------------------------- framework/src/org/apache/cordova/AndroidWebView.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/e595c313/framework/src/org/apache/cordova/AndroidWebView.java ---------------------------------------------------------------------- diff --git a/framework/src/org/apache/cordova/AndroidWebView.java b/framework/src/org/apache/cordova/AndroidWebView.java index 6a0ac30..6f73dbf 100755 --- a/framework/src/org/apache/cordova/AndroidWebView.java +++ b/framework/src/org/apache/cordova/AndroidWebView.java @@ -219,13 +219,13 @@ public class AndroidWebView extends WebView implements CordovaWebView { * Create a default WebViewClient object for this webview. This can be overridden by the * main application's CordovaActivity subclass. * - * By default, it creates an AndroidWebViewClient, but we provide special case handling for - * IceCreamSandwich. + * There are two possible client objects that can be returned: + * AndroidWebViewClient for android < 3.0 + * IceCreamCordovaWebViewClient for Android >= 3.0 (Supports shouldInterceptRequest) */ @Override public CordovaWebViewClient makeWebViewClient() { - if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB || - android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) + if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.HONEYCOMB) { return (CordovaWebViewClient) new AndroidWebViewClient(this.cordova, this); }
