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 19:58:55 UTC
android commit: CB-3384 Bugfix - Non null Mimetype is not required
for WebResourceResponse
Updated Branches:
refs/heads/master 78efe2a96 -> 048107e37
CB-3384 Bugfix - Non null Mimetype is not required for WebResourceResponse
Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/048107e3
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/048107e3
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/048107e3
Branch: refs/heads/master
Commit: 048107e37870d52c0d16e5a82bac859eea466b85
Parents: 78efe2a
Author: Shravan Narayan <sh...@google.com>
Authored: Thu May 16 22:40:16 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Tue May 28 13:58:39 2013 -0400
----------------------------------------------------------------------
.../cordova/IceCreamCordovaWebViewClient.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-android/blob/048107e3/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..d68b6b8 100644
--- a/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
+++ b/framework/src/org/apache/cordova/IceCreamCordovaWebViewClient.java
@@ -56,9 +56,9 @@ public class IceCreamCordovaWebViewClient extends CordovaWebViewClient {
if(ret == null) {
try {
- InputStream is;
- String mimeType;
- if((is = dataResource.getInputStream()) != null && (mimeType = dataResource.getMimeType()) != null) {
+ 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);
}