[CB-3226] Fix: plugins can intercept urls with "?", "#", "%20"(cherry picked from commit 53982272d6)

This commit is contained in:
Shravan Narayan 2013-04-24 18:59:24 -04:00 committed by Andrew Grieve
parent b22990ca78
commit 665c1bd8bb

View File

@ -43,13 +43,12 @@ 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))){
return ret; ret = generateWebResourceResponse(url);
}
} }
return super.shouldInterceptRequest(view, url); return ret;
} }
private WebResourceResponse generateWebResourceResponse(String url) { private WebResourceResponse generateWebResourceResponse(String url) {