You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/05/28 04:31:33 UTC
[2/5] android commit: Revert "DataResource bugfix WebviewClient logs
error for http urls."
Revert "DataResource bugfix WebviewClient logs error for http urls."
This reverts commit 8f91ebf194baa8028367e9e41f2e5ee2ff099b88.
Reverting all DataResource changes for the 2.8.0 release.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/fbeba547
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/fbeba547
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/fbeba547
Branch: refs/heads/2.8.x
Commit: fbeba547401ef91bf847ffaa1cb3d4845d5ca971
Parents: 338216b
Author: Andrew Grieve <ag...@chromium.org>
Authored: Mon May 27 22:21:50 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Mon May 27 22:21:50 2013 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/FileHelper.java | 4 +---
.../cordova/IceCreamCordovaWebViewClient.java | 8 +-------
2 files changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fbeba547/framework/src/org/apache/cordova/FileHelper.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/FileHelper.java b/framework/src/org/apache/cordova/FileHelper.java
index 8bc24aa..400352c 100644
--- a/framework/src/org/apache/cordova/FileHelper.java
+++ b/framework/src/org/apache/cordova/FileHelper.java
@@ -98,10 +98,8 @@ public class FileHelper {
Uri uri = Uri.parse(uriString);
String relativePath = uri.getPath().substring(15);
return cordova.getActivity().getAssets().open(relativePath);
- } else if (uriString.startsWith("file://")) {
- return new FileInputStream(getRealPath(uriString, cordova));
} else {
- return null;
+ return new FileInputStream(getRealPath(uriString, cordova));
}
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/fbeba547/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
----------------------------------------------------------------------
diff --git a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
index 14c7603..d9c1cd2 100644
--- a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
@@ -19,7 +19,6 @@
package org.apache.cordova;
import java.io.IOException;
-import java.io.InputStream;
import org.apache.cordova.api.CordovaInterface;
import org.apache.cordova.api.DataResource;
@@ -56,12 +55,7 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {
if(ret == null) {
try {
- InputStream is;
- String mimeType;
- if((is = dataResource.getInputStream()) != null && (mimeType = dataResource.getMimeType()) != null) {
- // If we don't know how to open this file, let the browser continue loading
- ret = new WebResourceResponse(mimeType, "UTF-8", is);
- }
+ ret = new WebResourceResponse(dataResource.getMimeType(), "UTF-8", dataResource.getInputStream());
} catch(IOException e) {
LOG.e("IceCreamCordovaWebViewClient", "Error occurred while loading a file.", e);
}