cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject android commit: CB-5398 Apply KitKat content URI fix to all content URIs
Date Fri, 14 Feb 2014 16:02:42 GMT
Updated Branches:
  refs/heads/master 954a1723f -> 774131267


CB-5398 Apply KitKat content URI fix to all content URIs


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

Branch: refs/heads/master
Commit: 7741312673e36607f4c985b538f07105e84ae0b8
Parents: 954a172
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Fri Feb 14 11:02:17 2014 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Fri Feb 14 11:02:17 2014 -0500

----------------------------------------------------------------------
 .../src/org/apache/cordova/IceCreamCordovaWebViewClient.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/77413126/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
index 5f32243..63cfb91 100644
--- a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
@@ -75,13 +75,9 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient
{
     }
 
     private static boolean needsKitKatContentUrlFix(Uri uri) {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT)
{
-            if ("content".equals(uri.getScheme()) && uri.toString().contains("%3A"))
{
-                return true;
-            }
-        }
-        return false;
+        return android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT
&& "content".equals(uri.getScheme());
     }
+
     private static boolean needsSpecialsInAssetUrlFix(Uri uri) {
         if (CordovaResourceApi.getUriType(uri) != CordovaResourceApi.URI_TYPE_ASSET) {
             return false;


Mime
View raw message