firebase
diff --git a/‎packages/firebase_storage/firebase_storage/android/src/main/kotlin/io/flutter/plugins/firebase/storage/FlutterFirebaseStorageTask.kt‎
Lines changed: 3 additions & 1 deletion b/‎packages/firebase_storage/firebase_storage/android/src/main/kotlin/io/flutter/plugins/firebase/storage/FlutterFirebaseStorageTask.kt‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎tests/integration_test/firebase_storage/task_e2e.dart‎
Lines changed: 35 additions & 0 deletions b/‎tests/integration_test/firebase_storage/task_e2e.dart‎
Lines changed: 35 additions & 0 deletions
@@ -95,11 +95,13 @@ internal class FlutterFirebaseStorageTask private constructor(
     @JvmStatic
     fun cancelInProgressTasks() {
       synchronized(inProgressTasks) {
+        val tasks = ArrayList<FlutterFirebaseStorageTask>(inProgressTasks.size())
         for (i in 0 until inProgressTasks.size()) {
           val task: FlutterFirebaseStorageTask? = inProgressTasks.valueAt(i)
-          task?.destroy()
+          task?.let { tasks.add(it) }
         }
         inProgressTasks.clear()
+        tasks.forEach { it.destroy() }
       }
     }
 
 
@@ -6,9 +6,12 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
 import 'package:firebase_storage/firebase_storage.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:tests/firebase_options.dart';
 
 import './test_utils.dart';
 
@@ -346,6 +349,38 @@ void setupTaskTests() {
           // Windows `task.cancel()` is returning "false", same code on example app works as intended
           skip: defaultTargetPlatform == TargetPlatform.windows,
         );
+
+        test(
+          'cancels multiple in-progress Android tasks during core reinitialization',
+          () async {
+            final tasks = <UploadTask>[
+              for (var i = 0; i < 3; i++)
+                storage
+                    .ref('flutter-tests/regression-18240-$i.txt')
+                    .putString('A' * 20000000),
+            ];
+            final completions = tasks
+                .map(
+                  (task) => task.then<void>(
+                    (_) {},
+                    onError: (_) {},
+                  ),
+                )
+                .toList();
+
+            try {
+              MethodChannelFirebase.isCoreInitialized = false;
+              await Firebase.initializeApp(
+                options: DefaultFirebaseOptions.currentPlatform,
+              ).timeout(const Duration(seconds: 30));
+            } finally {
+              MethodChannelFirebase.isCoreInitialized = true;
+              completions.forEach(unawaited);
+            }
+          },
+          retry: 2,
+          skip: kIsWeb || defaultTargetPlatform != TargetPlatform.android,
+        );
       },
     );
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,13 @@ internal class FlutterFirebaseStorageTask private constructor(`
`95`	`95`	`@JvmStatic`
`96`	`96`	`fun cancelInProgressTasks() {`
`97`	`97`	`synchronized(inProgressTasks) {`
	`98`	`+ val tasks = ArrayList<FlutterFirebaseStorageTask>(inProgressTasks.size())`
`98`	`99`	`for (i in 0 until inProgressTasks.size()) {`
`99`	`100`	`val task: FlutterFirebaseStorageTask? = inProgressTasks.valueAt(i)`
`100`		`- task?.destroy()`
	`101`	`+ task?.let { tasks.add(it) }`
`101`	`102`	`}`
`102`	`103`	`inProgressTasks.clear()`
	`104`	`+ tasks.forEach { it.destroy() }`
`103`	`105`	`}`
`104`	`106`	`}`
`105`	`107`