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

CB-2391: Fix for colons crashing the WebView on ICS, tested on Samsung Galaxy S2

Browse Source
This commit is contained in:
Joe Bowser 2013-06-14 16:55:47 -07:00
parent 6689827278
commit 9ac4b570e6
1 changed files with 10 additions and 4 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

@ -51,7 +51,7 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {
{ {
ret = getWhitelistResponse(); ret = getWhitelistResponse();
} }
else if(ret == null && (url.contains("?") || url.contains("#") || needsIceCreamSpaceInAssetUrlFix(url))){ else if(ret == null && (url.contains("?") || url.contains("#") || needsIceCreamSpecialsInAssetUrlFix(url))){
ret = generateWebResourceResponse(url); ret = generateWebResourceResponse(url);
} }
else if (ret == null && this.appView.pluginManager != null) { else if (ret == null && this.appView.pluginManager != null) {
@ -83,11 +83,17 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {
return null; return null;
} }
private static boolean needsIceCreamSpaceInAssetUrlFix(String url) { private static boolean needsIceCreamSpecialsInAssetUrlFix(String url) {
// Encoded Spaces
if (!url.contains("%20")){ if (!url.contains("%20")){
return false; return false;
} }
// colons
if(url.split(":").length <= 2) {
return false;
}
switch(android.os.Build.VERSION.SDK_INT){ switch(android.os.Build.VERSION.SDK_INT){
case android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH: case android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH:
case android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1: case android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1: