Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9806810DD2 for ; Thu, 6 Jun 2013 21:36:03 +0000 (UTC) Received: (qmail 10803 invoked by uid 500); 6 Jun 2013 21:36:03 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 10723 invoked by uid 500); 6 Jun 2013 21:36:03 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 10703 invoked by uid 99); 6 Jun 2013 21:36:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jun 2013 21:36:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 249D481399B; Thu, 6 Jun 2013 21:36:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bowserj@apache.org To: commits@cordova.apache.org Date: Thu, 06 Jun 2013 21:36:04 -0000 Message-Id: In-Reply-To: <351758c271db41cb84a48f4e693bfc73@git.apache.org> References: <351758c271db41cb84a48f4e693bfc73@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] 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. Conflicts: framework/src/org/apache/cordova/FileHelper.java framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/2f9c512b Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/2f9c512b Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/2f9c512b Branch: refs/heads/master Commit: 2f9c512b5942ae2c04002fe8c5581b6d514b8c52 Parents: 43172cf Author: Andrew Grieve Authored: Mon May 27 22:21:50 2013 -0400 Committer: Joe Bowser Committed: Thu Jun 6 14:08:52 2013 -0700 ---------------------------------------------------------------------- framework/src/org/apache/cordova/FileHelper.java | 2 +- .../cordova/IceCreamCordovaWebViewClient.java | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2f9c512b/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 0d13c12..69c7f48 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)); } } http://git-wip-us.apache.org/repos/asf/cordova-android/blob/2f9c512b/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 d68b6b8..4b3408c 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); }