Fix job strategy cancel all requests

Author: adimiz1

core/src/main/java/com/cloudinary/android/AndroidJobStrategy.java

@@ -108,11 +108,9 @@ public boolean cancelRequest(String requestId) {
         return operation.getResult().isCancelled();
     }
 
-    @Override
     public int cancelAllRequests() {
         WorkManager.getInstance(context).cancelAllWork();
-        killAllThreads();
-        return 0;
+        return killAllThreads();
     }
 
     private void killThread(String requestId) {
@@ -129,8 +127,9 @@ private void killThread(String requestId) {
         }
     }
 
-    private void killAllThreads() {
+    private int killAllThreads() {
         synchronized (threadsMapLockObject) {
+            int size = threads.size();
             for (String requestId : threads.keySet()) {
                 WeakReference<Thread> ref = threads.get(requestId);
                 Thread thread = ref.get();
@@ -141,8 +140,8 @@ private void killAllThreads() {
 
                 ref.clear();
             }
-
             threads.clear();
+            return size;
         }
     }
 

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

@@ -13,6 +13,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InterruptedIOException;
 import java.net.HttpURLConnection;
 import java.util.Collection;
 import java.util.Map;
@@ -73,7 +74,7 @@ public void totalBytesLoaded(long bytes) {
         }
 
         MultipartUtility multipart = null;
-        HttpURLConnection connection;
+        HttpURLConnection connection = null;
 
         try {
             int connectTimeout = options.get("connect_timeout") != null ? (int) options.get("connect_timeout") : 0;
@@ -108,6 +109,8 @@ public void totalBytesLoaded(long bytes) {
             }
 
             connection = multipart.execute();
+        } catch(InterruptedIOException e ) {
+            e.printStackTrace();
         } finally {
             if (multipart != null){
                 // Closing more than once has no effect so we can call it safely without having to check state