github/cordova-plugin-file-transfer
4
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-file-transfer.git synced 2026-04-28 00:02:49 +08:00
Code Issues Projects Releases Wiki Activity

[android] [CB-3384] Make FileTransfer use CordovaResourceApi.

Browse Source
This commit is contained in:
Andrew Grieve
2013-07-13 17:18:23 -04:00
parent 616bc344be
commit d29f2b044b
1 changed files with 70 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/android/FileTransfer.java
+69 -96
View File
@@ -22,7 +22,6 @@ import java.io.BufferedReader;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.Closeable; import java.io.Closeable;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.FilterInputStream; import java.io.FilterInputStream;
import java.io.IOException; import java.io.IOException;
@@ -31,8 +30,6 @@ import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.security.cert.CertificateException; import java.security.cert.CertificateException;
@@ -53,20 +50,18 @@ import javax.net.ssl.X509TrustManager;
import org.apache.cordova.Config; import org.apache.cordova.Config;
import org.apache.cordova.CallbackContext; import org.apache.cordova.CallbackContext;
import org.apache.cordova.CordovaPlugin; import org.apache.cordova.CordovaPlugin;
import org.apache.cordova.CordovaResourceApi;
import org.apache.cordova.CordovaResourceApi.OpenForReadResult;
import org.apache.cordova.PluginResult; import org.apache.cordova.PluginResult;
import org.apache.cordova.UriResolver;
import org.json.JSONArray; import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import android.content.ContentResolver;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.util.Log; import android.util.Log;
import android.webkit.CookieManager; import android.webkit.CookieManager;
import com.squareup.okhttp.OkHttpClient;
public class FileTransfer extends CordovaPlugin { public class FileTransfer extends CordovaPlugin {
private static final String LOG_TAG = "FileTransfer"; private static final String LOG_TAG = "FileTransfer";
@@ -82,8 +77,6 @@ public class FileTransfer extends CordovaPlugin {
private static HashMap<String, RequestContext> activeRequests = new HashMap<String, RequestContext>(); private static HashMap<String, RequestContext> activeRequests = new HashMap<String, RequestContext>();
private static final int MAX_BUFFER_SIZE = 16 * 1024; private static final int MAX_BUFFER_SIZE = 16 * 1024;
private static OkHttpClient httpClient = new OkHttpClient();
private static final class RequestContext { private static final class RequestContext {
String source; String source;
String target; String target;
@@ -253,6 +246,8 @@ public class FileTransfer extends CordovaPlugin {
final String objectId = args.getString(9); final String objectId = args.getString(9);
final String httpMethod = getArgument(args, 10, "POST"); final String httpMethod = getArgument(args, 10, "POST");
final CordovaResourceApi resourceApi = webView.getResourceApi();
Log.d(LOG_TAG, "fileKey: " + fileKey); Log.d(LOG_TAG, "fileKey: " + fileKey);
Log.d(LOG_TAG, "fileName: " + fileName); Log.d(LOG_TAG, "fileName: " + fileName);
Log.d(LOG_TAG, "mimeType: " + mimeType); Log.d(LOG_TAG, "mimeType: " + mimeType);
@@ -263,16 +258,20 @@ public class FileTransfer extends CordovaPlugin {
Log.d(LOG_TAG, "objectId: " + objectId); Log.d(LOG_TAG, "objectId: " + objectId);
Log.d(LOG_TAG, "httpMethod: " + httpMethod); Log.d(LOG_TAG, "httpMethod: " + httpMethod);
final URL url; final Uri targetUri = resourceApi.remapUri(Uri.parse(target));
try { // Accept a path or a URI for the source.
url = new URL(target); Uri tmpSrc = Uri.parse(source);
} catch (MalformedURLException e) { final Uri sourceUri = resourceApi.remapUri(
tmpSrc.getScheme() != null ? tmpSrc : Uri.fromFile(new File(source)));
int uriType = CordovaResourceApi.getUriType(targetUri);
final boolean useHttps = uriType == CordovaResourceApi.URI_TYPE_HTTPS;
if (uriType != CordovaResourceApi.URI_TYPE_HTTP && !useHttps) {
JSONObject error = createFileTransferError(INVALID_URL_ERR, source, target, null, 0); JSONObject error = createFileTransferError(INVALID_URL_ERR, source, target, null, 0);
Log.e(LOG_TAG, error.toString(), e); Log.e(LOG_TAG, "Unsupported URI: " + targetUri);
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.IO_EXCEPTION, error)); callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.IO_EXCEPTION, error));
return; return;
} }
final boolean useHttps = url.getProtocol().equals("https");
final RequestContext context = new RequestContext(source, target, callbackContext); final RequestContext context = new RequestContext(source, target, callbackContext);
synchronized (activeRequests) { synchronized (activeRequests) {
@@ -296,27 +295,15 @@ public class FileTransfer extends CordovaPlugin {
//------------------ CLIENT REQUEST //------------------ CLIENT REQUEST
// Open a HTTP connection to the URL based on protocol // Open a HTTP connection to the URL based on protocol
if (useHttps) { conn = resourceApi.createHttpConnection(targetUri);
// Using standard HTTPS connection. Will not allow self signed certificate if (useHttps && trustEveryone) {
if (!trustEveryone) { // Setup the HTTPS connection class to trust everyone
conn = (HttpsURLConnection) httpClient.open(url); HttpsURLConnection https = (HttpsURLConnection)conn;
} oldSocketFactory = trustAllHosts(https);
// Use our HTTPS connection that blindly trusts everyone. // Save the current hostnameVerifier
// This should only be used in debug environments oldHostnameVerifier = https.getHostnameVerifier();
else { // Setup the connection not to verify hostnames
// Setup the HTTPS connection class to trust everyone https.setHostnameVerifier(DO_NOT_VERIFY);
HttpsURLConnection https = (HttpsURLConnection) httpClient.open(url);
oldSocketFactory = trustAllHosts(https);
// Save the current hostnameVerifier
oldHostnameVerifier = https.getHostnameVerifier();
// Setup the connection not to verify hostnames
https.setHostnameVerifier(DO_NOT_VERIFY);
conn = https;
}
}
// Return a standard HTTP connection
else {
conn = httpClient.open(url);
} }
// Allow Inputs // Allow Inputs
@@ -373,11 +360,11 @@ public class FileTransfer extends CordovaPlugin {
// Get a input stream of the file on the phone // Get a input stream of the file on the phone
InputStream sourceInputStream = webView.resolveUri(Uri.parse(source)).getInputStream(); OpenForReadResult readResult = resourceApi.openForRead(sourceUri);
int stringLength = beforeDataBytes.length + tailParamsBytes.length; int stringLength = beforeDataBytes.length + tailParamsBytes.length;
if (sourceInputStream instanceof FileInputStream) { if (readResult.length >= 0) {
fixedLength = (int) ((FileInputStream)sourceInputStream).getChannel().size() + stringLength; fixedLength = (int)readResult.length + stringLength;
progress.setLengthComputable(true); progress.setLengthComputable(true);
progress.setTotal(fixedLength); progress.setTotal(fixedLength);
} }
@@ -413,12 +400,12 @@ public class FileTransfer extends CordovaPlugin {
totalBytes += beforeDataBytes.length; totalBytes += beforeDataBytes.length;
// create a buffer of maximum size // create a buffer of maximum size
int bytesAvailable = sourceInputStream.available(); int bytesAvailable = readResult.inputStream.available();
int bufferSize = Math.min(bytesAvailable, MAX_BUFFER_SIZE); int bufferSize = Math.min(bytesAvailable, MAX_BUFFER_SIZE);
byte[] buffer = new byte[bufferSize]; byte[] buffer = new byte[bufferSize];
// read file and write it into form... // read file and write it into form...
int bytesRead = sourceInputStream.read(buffer, 0, bufferSize); int bytesRead = readResult.inputStream.read(buffer, 0, bufferSize);
long prevBytesRead = 0; long prevBytesRead = 0;
while (bytesRead > 0) { while (bytesRead > 0) {
@@ -429,9 +416,9 @@ public class FileTransfer extends CordovaPlugin {
prevBytesRead = totalBytes; prevBytesRead = totalBytes;
Log.d(LOG_TAG, "Uploaded " + totalBytes + " of " + fixedLength + " bytes"); Log.d(LOG_TAG, "Uploaded " + totalBytes + " of " + fixedLength + " bytes");
} }
bytesAvailable = sourceInputStream.available(); bytesAvailable = readResult.inputStream.available();
bufferSize = Math.min(bytesAvailable, MAX_BUFFER_SIZE); bufferSize = Math.min(bytesAvailable, MAX_BUFFER_SIZE);
bytesRead = sourceInputStream.read(buffer, 0, bufferSize); bytesRead = readResult.inputStream.read(buffer, 0, bufferSize);
// Send a progress event. // Send a progress event.
progress.setLoaded(totalBytes); progress.setLoaded(totalBytes);
@@ -445,7 +432,7 @@ public class FileTransfer extends CordovaPlugin {
totalBytes += tailParamsBytes.length; totalBytes += tailParamsBytes.length;
sendStream.flush(); sendStream.flush();
} finally { } finally {
safeClose(sourceInputStream); safeClose(readResult.inputStream);
safeClose(sendStream); safeClose(sendStream);
} }
context.currentOutputStream = null; context.currentOutputStream = null;
@@ -668,28 +655,30 @@ public class FileTransfer extends CordovaPlugin {
private void download(final String source, final String target, JSONArray args, CallbackContext callbackContext) throws JSONException { private void download(final String source, final String target, JSONArray args, CallbackContext callbackContext) throws JSONException {
Log.d(LOG_TAG, "download " + source + " to " + target); Log.d(LOG_TAG, "download " + source + " to " + target);
final CordovaResourceApi resourceApi = webView.getResourceApi();
final boolean trustEveryone = args.optBoolean(2); final boolean trustEveryone = args.optBoolean(2);
final String objectId = args.getString(3); final String objectId = args.getString(3);
final JSONObject headers = args.optJSONObject(4); final JSONObject headers = args.optJSONObject(4);
final URL url; final Uri sourceUri = resourceApi.remapUri(Uri.parse(source));
try { // Accept a path or a URI for the source.
url = new URL(source); Uri tmpTarget = Uri.parse(target);
} catch (MalformedURLException e) { final Uri targetUri = resourceApi.remapUri(
tmpTarget.getScheme() != null ? tmpTarget : Uri.fromFile(new File(target)));
int uriType = CordovaResourceApi.getUriType(sourceUri);
final boolean useHttps = uriType == CordovaResourceApi.URI_TYPE_HTTPS;
final boolean isLocalTransfer = !useHttps && uriType != CordovaResourceApi.URI_TYPE_HTTP;
if (uriType == CordovaResourceApi.URI_TYPE_UNKNOWN) {
JSONObject error = createFileTransferError(INVALID_URL_ERR, source, target, null, 0); JSONObject error = createFileTransferError(INVALID_URL_ERR, source, target, null, 0);
Log.e(LOG_TAG, error.toString(), e); Log.e(LOG_TAG, "Unsupported URI: " + targetUri);
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.IO_EXCEPTION, error)); callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.IO_EXCEPTION, error));
return; return;
} }
final String sourceProtocol = url.getProtocol();
final boolean useHttps = "https".equals(sourceProtocol);
final boolean useResolvers =
ContentResolver.SCHEME_FILE.equals(sourceProtocol) ||
ContentResolver.SCHEME_CONTENT.equals(sourceProtocol) ||
ContentResolver.SCHEME_ANDROID_RESOURCE.equals(sourceProtocol);
// TODO: refactor to also allow resources & content: // TODO: refactor to also allow resources & content:
if (!useResolvers && !Config.isUrlWhiteListed(source)) { if (!isLocalTransfer && !Config.isUrlWhiteListed(source)) {
Log.w(LOG_TAG, "Source URL is not in white list: '" + source + "'"); Log.w(LOG_TAG, "Source URL is not in white list: '" + source + "'");
JSONObject error = createFileTransferError(CONNECTION_ERR, source, target, null, 401); JSONObject error = createFileTransferError(CONNECTION_ERR, source, target, null, 401);
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.IO_EXCEPTION, error)); callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.IO_EXCEPTION, error));
@@ -707,64 +696,50 @@ public class FileTransfer extends CordovaPlugin {
if (context.aborted) { if (context.aborted) {
return; return;
} }
URLConnection connection = null; HttpURLConnection connection = null;
HostnameVerifier oldHostnameVerifier = null; HostnameVerifier oldHostnameVerifier = null;
SSLSocketFactory oldSocketFactory = null; SSLSocketFactory oldSocketFactory = null;
File file = null; File file = null;
PluginResult result = null; PluginResult result = null;
TrackingInputStream inputStream = null; TrackingInputStream inputStream = null;
OutputStream outputStream = null;
try { try {
UriResolver sourceResolver = null; OpenForReadResult readResult = null;
UriResolver targetResolver = webView.resolveUri(Uri.parse(target)); outputStream = resourceApi.openOutputStream(targetUri);
file = targetResolver.getLocalFile(); file = resourceApi.mapUriToFile(targetUri);
context.targetFile = file; context.targetFile = file;
Log.d(LOG_TAG, "Download file:" + url); Log.d(LOG_TAG, "Download file:" + sourceUri);
FileProgressResult progress = new FileProgressResult(); FileProgressResult progress = new FileProgressResult();
if (useResolvers) { if (isLocalTransfer) {
sourceResolver = webView.resolveUri(Uri.parse(source)); readResult = resourceApi.openForRead(sourceUri);
long len = sourceResolver.computeLength(); if (readResult.length != -1) {
if (len != -1) {
progress.setLengthComputable(true); progress.setLengthComputable(true);
progress.setTotal(len); progress.setTotal(readResult.length);
} }
inputStream = new SimpleTrackingInputStream(sourceResolver.getInputStream()); inputStream = new SimpleTrackingInputStream(readResult.inputStream);
} else { } else {
// connect to server // connect to server
// Open a HTTP connection to the URL based on protocol // Open a HTTP connection to the URL based on protocol
if (useHttps) { connection = resourceApi.createHttpConnection(sourceUri);
// Using standard HTTPS connection. Will not allow self signed certificate if (useHttps && trustEveryone) {
if (!trustEveryone) { // Setup the HTTPS connection class to trust everyone
connection = (HttpsURLConnection) httpClient.open(url); HttpsURLConnection https = (HttpsURLConnection)connection;
} oldSocketFactory = trustAllHosts(https);
// Use our HTTPS connection that blindly trusts everyone. // Save the current hostnameVerifier
// This should only be used in debug environments oldHostnameVerifier = https.getHostnameVerifier();
else { // Setup the connection not to verify hostnames
// Setup the HTTPS connection class to trust everyone https.setHostnameVerifier(DO_NOT_VERIFY);
HttpsURLConnection https = (HttpsURLConnection) httpClient.open(url);
oldSocketFactory = trustAllHosts(https);
// Save the current hostnameVerifier
oldHostnameVerifier = https.getHostnameVerifier();
// Setup the connection not to verify hostnames
https.setHostnameVerifier(DO_NOT_VERIFY);
connection = https;
}
}
// Return a standard HTTP connection
else {
connection = httpClient.open(url);
} }
if (connection instanceof HttpURLConnection) { connection.setRequestMethod("GET");
((HttpURLConnection)connection).setRequestMethod("GET");
}
//Add cookie support // TODO: Make OkHttp use this CookieManager by default.
String cookie = CookieManager.getInstance().getCookie(source); String cookie = CookieManager.getInstance().getCookie(sourceUri.toString());
if(cookie != null) if(cookie != null)
{ {
connection.setRequestProperty("cookie", cookie); connection.setRequestProperty("cookie", cookie);
@@ -789,10 +764,7 @@ public class FileTransfer extends CordovaPlugin {
inputStream = getInputStream(connection); inputStream = getInputStream(connection);
} }
OutputStream outputStream = null;
try { try {
outputStream = targetResolver.getOutputStream();
synchronized (context) { synchronized (context) {
if (context.aborted) { if (context.aborted) {
return; return;
@@ -839,6 +811,7 @@ public class FileTransfer extends CordovaPlugin {
Log.e(LOG_TAG, error.toString(), e); Log.e(LOG_TAG, error.toString(), e);
result = new PluginResult(PluginResult.Status.IO_EXCEPTION, error); result = new PluginResult(PluginResult.Status.IO_EXCEPTION, error);
} finally { } finally {
safeClose(outputStream);
synchronized (activeRequests) { synchronized (activeRequests) {
activeRequests.remove(objectId); activeRequests.remove(objectId);
} }