You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2013/06/14 20:52:24 UTC
[5/6] android commit: Revert "Revert "DataResource bugfix
WebviewClient logs error for http urls.""
Revert "Revert "DataResource bugfix WebviewClient logs error for http urls.""
This reverts commit 2f9c512b5942ae2c04002fe8c5581b6d514b8c52.
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/570173df
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/570173df
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/570173df
Branch: refs/heads/dataresource
Commit: 570173df5d7137b72bc453b67e3d93654e1b0776
Parents: 489ce0b
Author: Braden Shepherdson <br...@gmail.com>
Authored: Fri Jun 7 10:17:44 2013 -0400
Committer: Braden Shepherdson <br...@gmail.com>
Committed: Fri Jun 14 14:52:10 2013 -0400
----------------------------------------------------------------------
framework/src/org/apache/cordova/FileHelper.java | 2 +-
.../src/org/apache/cordova/IceCreamCordovaWebViewClient.java | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/570173df/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 69c7f48..0d13c12 100644
--- a/framework/src/org/apache/cordova/FileHelper.java
+++ b/framework/src/org/apache/cordova/FileHelper.java
@@ -107,7 +107,7 @@ public class FileHelper {
return new FileInputStream(getRealPath(uriString, cordova));
}
} else {
- return new FileInputStream(getRealPath(uriString, cordova));
+ return null;
}
}
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/570173df/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 4b3408c..d68b6b8 100644
--- a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
@@ -19,6 +19,7 @@
package org.apache.cordova;
import java.io.IOException;
+import java.io.InputStream;
import org.apache.cordova.api.CordovaInterface;
import org.apache.cordova.api.DataResource;
@@ -55,7 +56,12 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {
if(ret == null) {
try {
- ret = new WebResourceResponse(dataResource.getMimeType(), "UTF-8", dataResource.getInputStream());
+ InputStream is = 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) {
LOG.e("IceCreamCordovaWebViewClient", "Error occurred while loading a file.", e);
}