fix(storage, android): fix concurrency issue (#10099)

firebase · Dec 15, 2022 · d0b6fcf · d0b6fcf
1 parent 071c4d5
commit d0b6fcf
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/...android/src/main/java/io/flutter/plugins/firebase/storage/FlutterFirebaseStorageTask.java b/...android/src/main/java/io/flutter/plugins/firebase/storage/FlutterFirebaseStorageTask.java
@@ -58,7 +58,9 @@ private FlutterFirebaseStorageTask(
     this.bytes = bytes;
     this.fileUri = fileUri;
     this.metadata = metadata;
-    inProgressTasks.put(handle, this);
+    synchronized (inProgressTasks) {
+      inProgressTasks.put(handle, this);
+    }
   }
 
   @Nullable
@@ -72,12 +74,7 @@ static void cancelInProgressTasks() {
     synchronized (inProgressTasks) {
       for (int i = 0; i < inProgressTasks.size(); i++) {
         FlutterFirebaseStorageTask task = null;
-        try {
-          task = inProgressTasks.valueAt(i);
-        } catch (ArrayIndexOutOfBoundsException e) {
-          // TODO(Salakar): Why does this happen? Race condition / multiple destroy calls?
-          // Can safely ignore exception for now, see https://github.com/firebase/flutterfire/issues/4334
-        }
+        task = inProgressTasks.valueAt(i);
         if (task != null) {
           task.destroy();
         }
@@ -150,12 +147,7 @@ void destroy() {
       if (storageTask.isInProgress() || storageTask.isPaused()) {
         storageTask.cancel();
       }
-      try {
-        inProgressTasks.remove(handle);
-      } catch (ArrayIndexOutOfBoundsException e) {
-        // TODO(Salakar): Why does this happen? Race condition / multiple destroy calls?
-        // Can safely ignore exception for now, see https://github.com/firebase/flutterfire/issues/4334
-      }
+      inProgressTasks.remove(handle);
     }
 
     synchronized (cancelSyncObject) {