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

Merge branch '2.7.x' of https://git-wip-us.apache.org/repos/asf/cordova-android into 2.7.x

Browse Source
This commit is contained in:
Joe Bowser 2013-04-25 10:20:07 -07:00
commit fea8c5d204
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/")) {