From fbeba547401ef91bf847ffaa1cb3d4845d5ca971 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. --- framework/src/org/apache/cordova/FileHelper.java | 4 +--- .../org/apache/cordova/IceCreamCordovaWebViewClient.java | 8 +------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/framework/src/org/apache/cordova/FileHelper.java b/framework/src/org/apache/cordova/FileHelper.java index 8bc24aa1..400352cc 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)); } } diff --git a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java index 14c76037..d9c1cd21 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); }