From 2f9c512b5942ae2c04002fe8c5581b6d514b8c52 Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Mon, 27 May 2013 22:21:50 -0400 Subject: [PATCH] Revert "DataResource bugfix WebviewClient logs error for http urls." This reverts commit 8f91ebf194baa8028367e9e41f2e5ee2ff099b88. 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 --- framework/src/org/apache/cordova/FileHelper.java | 2 +- .../org/apache/cordova/IceCreamCordovaWebViewClient.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/framework/src/org/apache/cordova/FileHelper.java b/framework/src/org/apache/cordova/FileHelper.java index 0d13c127..69c7f489 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 null; + return new FileInputStream(getRealPath(uriString, cordova)); } } diff --git a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java index d68b6b81..4b3408c9 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 = 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); - } + ret = new WebResourceResponse(dataResource.getMimeType(), "UTF-8", dataResource.getInputStream()); } catch(IOException e) { LOG.e("IceCreamCordovaWebViewClient", "Error occurred while loading a file.", e); }