From 9713e968968b8d6a544df84d0f58edbb779e5627 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Mon, 21 Oct 2024 18:56:13 +0530 Subject: [PATCH] [mob][photos] Stop popping root navigator to avoid black screen from appearing --- mobile/lib/ui/account/delete_account_page.dart | 4 ++-- mobile/lib/ui/account/sessions_page.dart | 4 ++-- mobile/lib/ui/home/grant_permissions_widget.dart | 3 +-- mobile/lib/ui/settings/debug/debug_section_widget.dart | 2 +- mobile/lib/ui/settings/security_section_widget.dart | 4 ++-- mobile/lib/ui/tabs/home_widget.dart | 2 +- mobile/lib/ui/viewer/actions/delete_empty_albums.dart | 4 ++-- mobile/lib/ui/viewer/file/exif_info_dialog.dart | 2 +- mobile/lib/utils/email_util.dart | 6 +++--- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/mobile/lib/ui/account/delete_account_page.dart b/mobile/lib/ui/account/delete_account_page.dart index 950ceef976..e4259a6077 100644 --- a/mobile/lib/ui/account/delete_account_page.dart +++ b/mobile/lib/ui/account/delete_account_page.dart @@ -17,8 +17,8 @@ import "package:photos/utils/toast_util.dart"; class DeleteAccountPage extends StatefulWidget { const DeleteAccountPage({ - Key? key, - }) : super(key: key); + super.key, + }); @override State createState() => _DeleteAccountPageState(); diff --git a/mobile/lib/ui/account/sessions_page.dart b/mobile/lib/ui/account/sessions_page.dart index eae4dcd2fa..fd726d8e35 100644 --- a/mobile/lib/ui/account/sessions_page.dart +++ b/mobile/lib/ui/account/sessions_page.dart @@ -184,7 +184,7 @@ class _SessionsPageState extends State { ), ), onPressed: () async { - Navigator.of(context, rootNavigator: true).pop('dialog'); + Navigator.of(context).pop('dialog'); if (isLoggingOutFromThisDevice) { await UserService.instance.logout(context); } else { @@ -202,7 +202,7 @@ class _SessionsPageState extends State { ), ), onPressed: () { - Navigator.of(context, rootNavigator: true).pop('dialog'); + Navigator.of(context).pop('dialog'); }, ), ], diff --git a/mobile/lib/ui/home/grant_permissions_widget.dart b/mobile/lib/ui/home/grant_permissions_widget.dart index 2773f0771e..40f43429b6 100644 --- a/mobile/lib/ui/home/grant_permissions_widget.dart +++ b/mobile/lib/ui/home/grant_permissions_widget.dart @@ -127,8 +127,7 @@ class _GrantPermissionsWidgetState extends State { ), ), onPressed: () { - Navigator.of(context, rootNavigator: true) - .pop('dialog'); + Navigator.of(context).pop('dialog'); if (Platform.isIOS) { PhotoManager.openSetting(); } diff --git a/mobile/lib/ui/settings/debug/debug_section_widget.dart b/mobile/lib/ui/settings/debug/debug_section_widget.dart index 3a7634287b..55b0ef4f10 100644 --- a/mobile/lib/ui/settings/debug/debug_section_widget.dart +++ b/mobile/lib/ui/settings/debug/debug_section_widget.dart @@ -109,7 +109,7 @@ class DebugSectionWidget extends StatelessWidget { TextButton( child: const Text("OK"), onPressed: () { - Navigator.of(context, rootNavigator: true).pop('dialog'); + Navigator.of(context).pop('dialog'); }, ), ], diff --git a/mobile/lib/ui/settings/security_section_widget.dart b/mobile/lib/ui/settings/security_section_widget.dart index 52962b097a..403a5506d4 100644 --- a/mobile/lib/ui/settings/security_section_widget.dart +++ b/mobile/lib/ui/settings/security_section_widget.dart @@ -229,7 +229,7 @@ class _SecuritySectionWidgetState extends State { ), ), onPressed: () { - Navigator.of(context, rootNavigator: true).pop('dialog'); + Navigator.of(context).pop('dialog'); }, ), TextButton( @@ -241,7 +241,7 @@ class _SecuritySectionWidgetState extends State { ), onPressed: () async { await UserService.instance.disableTwoFactor(context); - Navigator.of(context, rootNavigator: true).pop('dialog'); + Navigator.of(context).pop('dialog'); }, ), ], diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart index 53c0b47190..63af06442b 100644 --- a/mobile/lib/ui/tabs/home_widget.dart +++ b/mobile/lib/ui/tabs/home_widget.dart @@ -239,7 +239,7 @@ class _HomeWidgetState extends State { ), ), onPressed: () async { - Navigator.of(context, rootNavigator: true).pop('dialog'); + Navigator.of(context).pop('dialog'); Navigator.of(context).popUntil((route) => route.isFirst); final dialog = createProgressDialog(context, S.of(context).loggingOut); diff --git a/mobile/lib/ui/viewer/actions/delete_empty_albums.dart b/mobile/lib/ui/viewer/actions/delete_empty_albums.dart index 3f801e5a47..95ee49da49 100644 --- a/mobile/lib/ui/viewer/actions/delete_empty_albums.dart +++ b/mobile/lib/ui/viewer/actions/delete_empty_albums.dart @@ -84,7 +84,7 @@ class _DeleteEmptyAlbumsState extends State { onTap: () async { await _deleteEmptyAlbums(); if (!_isCancelled) { - Navigator.of(context, rootNavigator: true).pop(); + Navigator.of(context).pop(); } Bus.instance.fire( CollectionUpdatedEvent( @@ -104,7 +104,7 @@ class _DeleteEmptyAlbumsState extends State { shouldStickToDarkTheme: true, onTap: () async { _isCancelled = true; - Navigator.of(context, rootNavigator: true).pop(); + Navigator.of(context).pop(); }, ), ], diff --git a/mobile/lib/ui/viewer/file/exif_info_dialog.dart b/mobile/lib/ui/viewer/file/exif_info_dialog.dart index 7ffbf7eb1b..7830b79e09 100644 --- a/mobile/lib/ui/viewer/file/exif_info_dialog.dart +++ b/mobile/lib/ui/viewer/file/exif_info_dialog.dart @@ -41,7 +41,7 @@ class ExifInfoDialog extends StatelessWidget { style: textTheme.body, ), onPressed: () { - Navigator.of(context, rootNavigator: true).pop('dialog'); + Navigator.of(context).pop('dialog'); }, ), ], diff --git a/mobile/lib/utils/email_util.dart b/mobile/lib/utils/email_util.dart index 3486027e1a..26d7e7b59d 100644 --- a/mobile/lib/utils/email_util.dart +++ b/mobile/lib/utils/email_util.dart @@ -119,7 +119,7 @@ Future _sendLogs( await FlutterEmailSender.send(email); } catch (e, s) { _logger.severe('email sender failed', e, s); - Navigator.of(context, rootNavigator: true).pop(); + Navigator.of(context).pop(); await shareLogs(context, toEmail, zipFilePath); } } @@ -275,14 +275,14 @@ Future sendEmail( emailContent: content, ); - Navigator.of(context, rootNavigator: true).pop(); + Navigator.of(context).pop(); }, ), ], cancelButton: CupertinoActionSheetAction( child: Text(S.of(context).cancel), onPressed: () { - Navigator.of(context, rootNavigator: true).pop(); + Navigator.of(context).pop(); }, ), ),