CB-6378 Use connection.disconnect() instead of stream.close() for thread-safety

src/android/FileTransfer.java

@@ -81,8 +81,7 @@ public class FileTransfer extends CordovaPlugin {
         String target;
         File targetFile;
         CallbackContext callbackContext;
-        InputStream currentInputStream;
-        OutputStream currentOutputStream;
+        HttpURLConnection connection;
         boolean aborted;
         RequestContext(String source, String target, CallbackContext callbackContext) {
             this.source = source;
@@ -384,7 +383,7 @@ public class FileTransfer extends CordovaPlugin {
                             if (context.aborted) {
                                 return;
                             }
-                            context.currentOutputStream = sendStream;
+                            context.connection = conn;
                         }
                         //We don't want to change encoding, we just want this to write for all Unicode.
                         sendStream.write(beforeDataBytes);
@@ -426,7 +425,9 @@ public class FileTransfer extends CordovaPlugin {
                         safeClose(readResult.inputStream);
                         safeClose(sendStream);
                     }
-                    context.currentOutputStream = null;
+                    synchronized (context) {
+                        context.connection = null;
+                    }
                     Log.d(LOG_TAG, "Sent " + totalBytes + " of " + fixedLength);
 
                     //------------------ read the SERVER RESPONSE
@@ -441,7 +442,7 @@ public class FileTransfer extends CordovaPlugin {
                             if (context.aborted) {
                                 return;
                             }
-                            context.currentInputStream = inStream;
+                            context.connection = conn;
                         }
                         
                         ByteArrayOutputStream out = new ByteArrayOutputStream(Math.max(1024, conn.getContentLength()));
@@ -453,7 +454,9 @@ public class FileTransfer extends CordovaPlugin {
                         }
                         responseString = out.toString("UTF-8");
                     } finally {
-                        context.currentInputStream = null;
+                        synchronized (context) {
+                            context.connection = null;
+                        }
                         safeClose(inStream);
                     }
                     
@@ -767,7 +770,7 @@ public class FileTransfer extends CordovaPlugin {
                             if (context.aborted) {
                                 return;
                             }
-                            context.currentInputStream = inputStream;
+                            context.connection = connection;
                         }
                         
                         // write bytes to file
@@ -782,7 +785,9 @@ public class FileTransfer extends CordovaPlugin {
                             context.sendPluginResult(progressResult);
                         }
                     } finally {
-                        context.currentInputStream = null;
+                        synchronized (context) {
+                            context.connection = null;
+                        }
                         safeClose(inputStream);
                         safeClose(outputStream);
                     }
@@ -857,22 +862,21 @@ public class FileTransfer extends CordovaPlugin {
             context = activeRequests.remove(objectId);
         }
         if (context != null) {
-            File file = context.targetFile;
-            if (file != null) {
-                file.delete();
-            }
-            // Trigger the abort callback immediately to minimize latency between it and abort() being called.
-            JSONObject error = createFileTransferError(ABORTED_ERR, context.source, context.target, null, -1);
-            synchronized (context) {
-                context.sendPluginResult(new PluginResult(PluginResult.Status.ERROR, error));
-                context.aborted = true;
-            }
             // Closing the streams can block, so execute on a background thread.
             cordova.getThreadPool().execute(new Runnable() {
                 public void run() {
                     synchronized (context) {
-                        safeClose(context.currentInputStream);
-                        safeClose(context.currentOutputStream);
+                        File file = context.targetFile;
+                        if (file != null) {
+                            file.delete();
+                        }
+                        // Trigger the abort callback immediately to minimize latency between it and abort() being called.
+                        JSONObject error = createFileTransferError(ABORTED_ERR, context.source, context.target, null, -1);
+                        context.sendPluginResult(new PluginResult(PluginResult.Status.ERROR, error));
+                        context.aborted = true;
+                        if (context.connection != null) {
+                            context.connection.disconnect();
+                        }
                     }
                 }
             });