mirror of
https://github.com/apache/cordova-android.git
synced 2025-01-31 17:32:51 +08:00
Merge branch '2.7.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.7.x
This commit is contained in:
commit
fea8c5d204
@ -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) {
|
||||||
|
Loading…
Reference in New Issue
Block a user