public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

[CB-3226] Fix: plugins can intercept urls with "?", "#", "%20"

Browse Source
This commit is contained in:
Shravan Narayan 2013-04-24 18:59:24 -04:00
parent a32cf2344f
commit 53982272d6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,14 +43,13 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {
@Override @Override
public WebResourceResponse shouldInterceptRequest(WebView view, String url) { public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
if(url.contains("?") || url.contains("#") || needsIceCreamSpaceInAssetUrlFix(url)){ //Check if plugins intercept the request
WebResourceResponse ret = generateWebResourceResponse(url); WebResourceResponse ret = super.shouldInterceptRequest(view, url);
if (ret != null) { if(ret == null && (url.contains("?") || url.contains("#") || needsIceCreamSpaceInAssetUrlFix(url))){
ret = generateWebResourceResponse(url);
}
return ret; return ret;
} }
}
return super.shouldInterceptRequest(view, url);
}
private WebResourceResponse generateWebResourceResponse(String url) { private WebResourceResponse generateWebResourceResponse(String url) {
if (url.startsWith("file:///android_asset/")) { if (url.startsWith("file:///android_asset/")) {