π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] dont dismiss sheets if auth denied for trash page route
Priyanshu Dangare2732b9563ae8
diff --git a/mobile/apps/photos/lib/ui/tabs/albums/albums_manage_sheet.dart b/mobile/apps/photos/lib/ui/tabs/albums/albums_manage_sheet.dartindex 082fbfb9b0..1a0c050a94 100644--- a/mobile/apps/photos/lib/ui/tabs/albums/albums_manage_sheet.dart+++ b/mobile/apps/photos/lib/ui/tabs/albums/albums_manage_sheet.dart@@ -106,12 +106,14 @@ Future<void> showAlbumsManageSheet(BuildContext context) {label: strings.trash,icon: HugeIcons.strokeRoundedDelete01,iconColor: const Color(0xFFE3505A),- onTap: () async {- if (sheetContext.mounted) {- Navigator.of(sheetContext).pop();- }- await showTrashPage(context);- },+ onTap: () => showTrashPage(+ context,+ beforeRouteToPage: () {+ if (sheetContext.mounted) {+ Navigator.of(sheetContext).pop();+ }+ },+ ),),],),diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dartindex 7b3ae5018e..7ec779745a 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/trash_page.dart@@ -1,3 +1,4 @@+import "dart:async";import "dart:io";import "package:collection/collection.dart";@@ -30,7 +31,10 @@ import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.daimport "package:photos/ui/viewer/gallery/state/selection_state.dart";import "package:photos/utils/device_info.dart";-Future<void> showTrashPage(BuildContext context) async {+Future<void> showTrashPage(+ BuildContext context, {+ Function? beforeRouteToPage,+}) async {final l10n = context.strings;final hasAuthenticated = await LocalAuthenticationService.instance.requestLocalAuthentication(context, l10n.authToViewTrashedFiles);@@ -39,6 +43,7 @@ Future<void> showTrashPage(BuildContext context) async {flagService.internalUser &&Platform.isAndroid &&!await isAndroidSDKVersionLowerThan(android11SDKINT);+ await beforeRouteToPage?.call();if (!context.mounted) return;await routeToPage(context, _TrashPage(isDeviceTrashSupported));}