github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-22 08:53:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-5398 Work-around for KitKat content: URLs not rendering in <img> tags

Browse Source
This commit is contained in:
Andrew Grieve 2014-02-13 15:56:24 -05:00
parent 87285d94f7
commit 954a1723f1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
View File

@ -59,7 +59,7 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {
// Allow plugins to intercept WebView requests. // Allow plugins to intercept WebView requests.
Uri remappedUri = resourceApi.remapUri(origUri); Uri remappedUri = resourceApi.remapUri(origUri);
if (!origUri.equals(remappedUri) || needsSpecialsInAssetUrlFix(origUri)) { if (!origUri.equals(remappedUri) || needsSpecialsInAssetUrlFix(origUri) || needsKitKatContentUrlFix(origUri)) {
OpenForReadResult result = resourceApi.openForRead(remappedUri, true); OpenForReadResult result = resourceApi.openForRead(remappedUri, true);
return new WebResourceResponse(result.mimeType, "UTF-8", result.inputStream); return new WebResourceResponse(result.mimeType, "UTF-8", result.inputStream);
} }
@ -74,6 +74,14 @@ 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;
}
private static boolean needsSpecialsInAssetUrlFix(Uri uri) { private static boolean needsSpecialsInAssetUrlFix(Uri uri) {
if (CordovaResourceApi.getUriType(uri) != CordovaResourceApi.URI_TYPE_ASSET) { if (CordovaResourceApi.getUriType(uri) != CordovaResourceApi.URI_TYPE_ASSET) {
return false; return false;