Fix MultipartUtility - Verify inner stream is closed if an exception is thrown somewhere along the way.

Author: nitzanj

cloudinary-android/src/main/java/com/cloudinary/android/MultipartUtility.java

@@ -136,4 +136,9 @@ public HttpURLConnection execute() throws IOException {
         return httpConn;
     }
 
+    public void close(){
+        if (writer != null){
+            writer.close();
+        }
+    }
 }

cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java

@@ -5,7 +5,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.util.Collection;
 import java.util.Map;
@@ -48,66 +47,63 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
         String apiUrl = this.cloudinary().cloudinaryApiUrl(action, options);
-        MultipartUtility multipart = new MultipartUtility(apiUrl, "UTF-8", this.cloudinary().randomPublicId(), (Map<String, String>) options.get("extra_headers"));
 
-        // Remove blank parameters
-        for (Map.Entry<String, Object> param : params.entrySet()) {
-            if (param.getValue() instanceof Collection) {
-                for (Object value : (Collection) param.getValue()) {
-                    multipart.addFormField(param.getKey() + "[]", ObjectUtils.asString(value));
-                }
-            } else {
-                if (StringUtils.isNotBlank(param.getValue())) {
-                    multipart.addFormField(param.getKey(), param.getValue().toString());
+        MultipartUtility multipart = null;
+        HttpURLConnection connection;
+
+        try {
+            multipart = new MultipartUtility(apiUrl, "UTF-8", this.cloudinary().randomPublicId(), (Map<String, String>) options.get("extra_headers"));
+
+            // Remove blank parameters
+            for (Map.Entry<String, Object> param : params.entrySet()) {
+                if (param.getValue() instanceof Collection) {
+                    for (Object value : (Collection) param.getValue()) {
+                        multipart.addFormField(param.getKey() + "[]", ObjectUtils.asString(value));
+                    }
+                } else {
+                    if (StringUtils.isNotBlank(param.getValue())) {
+                        multipart.addFormField(param.getKey(), param.getValue().toString());
+                    }
                 }
             }
-        }
 
-        if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
-            file = new File((String) file);
-        }
-        String filename = (String) options.get("filename");
-        if (file instanceof File) {
-            multipart.addFilePart("file", (File) file, filename);
-        } else if (file instanceof String) {
-            multipart.addFormField("file", (String) file);
-        } else if (file instanceof InputStream) {
-            multipart.addFilePart("file", (InputStream) file, filename);
-        } else if (file instanceof byte[]) {
-            multipart.addFilePart("file", new ByteArrayInputStream((byte[]) file), filename);
+            if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+                file = new File((String) file);
+            }
+            String filename = (String) options.get("filename");
+            if (file instanceof File) {
+                multipart.addFilePart("file", (File) file, filename);
+            } else if (file instanceof String) {
+                multipart.addFormField("file", (String) file);
+            } else if (file instanceof InputStream) {
+                multipart.addFilePart("file", (InputStream) file, filename);
+            } else if (file instanceof byte[]) {
+                multipart.addFilePart("file", new ByteArrayInputStream((byte[]) file), filename);
+            }
+
+            connection = multipart.execute();
+        } finally {
+            if (multipart != null){
+                // Closing more than once has no effect so we can call it safely without having to check state
+                multipart.close();
+            }
         }
 
-        HttpURLConnection connection = multipart.execute();
         int code;
-
-        OutputStream outputStream = null;
-
         try {
             code = connection.getResponseCode();
-            outputStream = connection.getOutputStream();
-        } catch (Exception e) {
+        } catch (IOException e) {
             if (e.getMessage().equals("No authentication challenges found")) {
                 // Android trying to be clever...
                 code = 401;
             } else {
                 throw e;
             }
-        } finally {
-            if (outputStream != null) {
-                try {
-                    outputStream.close();
-                } catch (Exception e) {}
-            }
         }
-
         InputStream responseStream = code >= 400 ? connection.getErrorStream() : connection.getInputStream();
         String responseData = readFully(responseStream);
         connection.disconnect();
 
-        try {
-            responseStream.close();
-        } catch (Exception e) {}
-
         if (code != 200 && code != 400 && code != 404 && code != 500) {
             throw new RuntimeException("Server returned unexpected status code - " + code + " - " + responseData);
         }