π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Wait for batched deletion dialogs to close
ashilkn1101aaee1387
diff --git a/mobile/apps/photos/lib/utils/delete_file_util.dart b/mobile/apps/photos/lib/utils/delete_file_util.dartindex 99eb7fe104..83daba8fbc 100644--- a/mobile/apps/photos/lib/utils/delete_file_util.dart+++ b/mobile/apps/photos/lib/utils/delete_file_util.dart@@ -668,11 +668,12 @@ Future<LocalDeletionResult> deleteLocalFilesInBatches("Deleting " + localIDs.length.toString() + " backed up files...",key: dialogKey,);- // ignore: unawaited_futures- showDialog(+ ModalRoute<void>? dialogRoute;+ final dialogPopped = showDialog<void>(useRootNavigator: false,context: context,builder: (context) {+ dialogRoute = ModalRoute.of<void>(context);return dialog;},barrierColor: Colors.black.withValues(alpha: 0.85),@@ -696,7 +697,8 @@ Future<LocalDeletionResult> deleteLocalFilesInBatches(} finally {final dialogContext = dialogKey.currentContext;if (dialogContext != null && dialogContext.mounted) {- Navigator.of(dialogContext).pop('dialog');+ Navigator.of(dialogContext).pop();+ await (dialogRoute?.completed ?? dialogPopped);}}}diff --git a/mobile/apps/photos/test/ui/common/linear_progress_dialog_test.dart b/mobile/apps/photos/test/ui/common/linear_progress_dialog_test.dartnew file mode 100644index 0000000000..0faaea6ee3--- /dev/null+++ b/mobile/apps/photos/test/ui/common/linear_progress_dialog_test.dart@@ -0,0 +1,77 @@+import "package:ente_pure_utils/ente_pure_utils.dart";+import "package:flutter/material.dart";+import "package:flutter_test/flutter_test.dart";+import "package:photos/ui/common/linear_progress_dialog.dart";+import "package:photos/utils/delete_file_util.dart";++void main() {+ testWidgets("waits for batch dialog dismissal before showing success", (+ tester,+ ) async {+ var deletionCompleted = false;+ await tester.pumpWidget(+ MaterialApp(+ home: Builder(+ builder: (context) => Scaffold(+ body: TextButton(+ onPressed: () async {+ final result = await routeToPage<bool>(+ context,+ _BatchDeletionPage(+ onDeletionCompleted: () => deletionCompleted = true,+ ),+ forceCustomPageRoute: true,+ );+ if (result == true && context.mounted) {+ await showModalBottomSheet<void>(+ context: context,+ builder: (_) => const Text("Success"),+ );+ }+ },+ child: const Text("Open"),+ ),+ ),+ ),+ ),+ );++ await tester.tap(find.text("Open"));+ await tester.pumpAndSettle();+ await tester.tap(find.text("Delete"));+ await tester.pump();++ expect(find.byType(LinearProgressDialog), findsOneWidget);+ expect(deletionCompleted, isFalse);+ expect(find.text("Success"), findsNothing);++ await tester.pumpAndSettle();++ expect(find.byType(LinearProgressDialog), findsNothing);+ expect(deletionCompleted, isTrue);+ expect(find.text("Delete"), findsNothing);+ expect(find.text("Success"), findsOneWidget);+ });+}++class _BatchDeletionPage extends StatelessWidget {+ final VoidCallback onDeletionCompleted;++ const _BatchDeletionPage({required this.onDeletionCompleted});++ @override+ Widget build(BuildContext context) {+ return Scaffold(+ body: TextButton(+ onPressed: () async {+ final result = await deleteLocalFilesInBatches(context, const []);+ onDeletionCompleted();+ if (result.isCompleted && context.mounted) {+ Navigator.of(context).pop(true);+ }+ },+ child: const Text("Delete"),+ ),+ );+ }+}