github/cordova-android
github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-03-16 16:51:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify: EncodingUtils.getBytes(str) -> str.getBytes()

Browse Source
This commit is contained in:
Andrew Grieve 2015-04-23 15:58:56 -04:00
parent 85877d259c
commit 7e480d1ff9
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
framework/src/org/apache/cordova/CordovaResourceApi.java
View File

@ -28,8 +28,6 @@ import android.os.Looper;
import android.util.Base64; import android.util.Base64;
import android.webkit.MimeTypeMap; import android.webkit.MimeTypeMap;
import org.apache.http.util.EncodingUtils;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -38,6 +36,7 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
@ -427,7 +426,16 @@ public class CordovaResourceApi {
} }
} }
String dataPartAsString = uriAsString.substring(commaPos + 1); 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); InputStream inputStream = new ByteArrayInputStream(data);
return new OpenForReadResult(uri, inputStream, contentType, data.length, null); return new OpenForReadResult(uri, inputStream, contentType, data.length, null);
} }