From 7e480d1ff90fd64acb17c0458d96fce8ba1942da Mon Sep 17 00:00:00 2001 From: Andrew Grieve Date: Thu, 23 Apr 2015 15:58:56 -0400 Subject: [PATCH] Simplify: EncodingUtils.getBytes(str) -> str.getBytes() --- .../src/org/apache/cordova/CordovaResourceApi.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/framework/src/org/apache/cordova/CordovaResourceApi.java b/framework/src/org/apache/cordova/CordovaResourceApi.java index 274e9a15..b2b0380e 100644 --- a/framework/src/org/apache/cordova/CordovaResourceApi.java +++ b/framework/src/org/apache/cordova/CordovaResourceApi.java @@ -28,8 +28,6 @@ import android.os.Looper; import android.util.Base64; import android.webkit.MimeTypeMap; -import org.apache.http.util.EncodingUtils; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -38,6 +36,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.net.HttpURLConnection; import java.net.URL; import java.nio.channels.FileChannel; @@ -427,7 +426,16 @@ public class CordovaResourceApi { } } String dataPartAsString = uriAsString.substring(commaPos + 1); - byte[] data = base64 ? Base64.decode(dataPartAsString, Base64.DEFAULT) : EncodingUtils.getBytes(dataPartAsString, "UTF-8"); + byte[] data; + if (base64) { + data = Base64.decode(dataPartAsString, Base64.DEFAULT); + } else { + try { + data = dataPartAsString.getBytes("UTF-8"); + } catch (UnsupportedEncodingException e) { + data = dataPartAsString.getBytes(); + } + } InputStream inputStream = new ByteArrayInputStream(data); return new OpenForReadResult(uri, inputStream, contentType, data.length, null); }