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

Revert "DataResource bugfix WebviewClient logs error for http urls."

Browse Source 
This reverts commit 8f91ebf194.
Reverting all DataResource changes for the 2.8.0 release.

Conflicts:

	framework/src/org/apache/cordova/FileHelper.java
	framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
This commit is contained in:
Andrew Grieve 2013-05-27 22:21:50 -04:00 committed by Joe Bowser
parent 43172cf530
commit 2f9c512b59
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/org/apache/cordova/FileHelper.java
View File

@ -107,7 +107,7 @@ public class FileHelper {
return new FileInputStream(getRealPath(uriString, cordova)); return new FileInputStream(getRealPath(uriString, cordova));
} }
} else { } else {
return null; return new FileInputStream(getRealPath(uriString, cordova));
} }
} }

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

@ -19,7 +19,6 @@
package org.apache.cordova; package org.apache.cordova;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import org.apache.cordova.api.CordovaInterface; import org.apache.cordova.api.CordovaInterface;
import org.apache.cordova.api.DataResource; import org.apache.cordova.api.DataResource;
@ -56,12 +55,7 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {
if(ret == null) { if(ret == null) {
try { try {
InputStream is = dataResource.getInputStream(); ret = new WebResourceResponse(dataResource.getMimeType(), "UTF-8", dataResource.getInputStream());
if(is != null) {
String mimeType = dataResource.getMimeType();
// If we don't know how to open this file, let the browser continue loading
ret = new WebResourceResponse(mimeType, "UTF-8", is);
}
} catch(IOException e) { } catch(IOException e) {
LOG.e("IceCreamCordovaWebViewClient", "Error occurred while loading a file.", e); LOG.e("IceCreamCordovaWebViewClient", "Error occurred while loading a file.", e);
} }