Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
}
}

Expand Down
35 changes: 35 additions & 0 deletions tests/integration_test/firebase_storage/task_e2e.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down Expand Up @@ -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,
);
},
);

Expand Down
Loading