π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Fix toggles after notification permission grant
Priyanshu Dangare186d6804754c
diff --git a/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dartindex 9d314aa022..b1b3a37a05 100644--- a/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart+++ b/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart@@ -19,7 +19,7 @@ class NotificationSettingsScreen extends StatefulWidget {class _NotificationSettingsScreenStateextends State<NotificationSettingsScreen> {bool _hasPermission = false, _isCompletingToggle = false;- Future<void> Function()? _pendingToggle;+ Future<void> Function(bool toggleCurrent)? _pendingToggle;Timer? _permissionTimer;@override@@ -42,8 +42,10 @@ class _NotificationSettingsScreenStatereturn granted;}- Future<void> _runWithPermission(Future<void> Function() toggle) async {- if (_hasPermission) return toggle();+ Future<void> _runWithPermission(+ Future<void> Function(bool toggleCurrent) toggle,+ ) async {+ if (_hasPermission) return toggle(true);_pendingToggle = toggle;_permissionTimer ??= Timer.periodic(@@ -65,7 +67,7 @@ class _NotificationSettingsScreenState_pendingToggle = null;_permissionTimer?.cancel();_permissionTimer = null;- await toggle();+ await toggle(false);if (mounted) setState(() {});} finally {_isCompletingToggle = false;@@ -91,10 +93,10 @@ class _NotificationSettingsScreenStatevalue: () =>_hasPermission &&service.shouldShowNotificationsForSharedPhotosAndAlbums(),- onChanged: () => _runWithPermission(() async {+ onChanged: () => _runWithPermission((toggleCurrent) async {final prev = service.shouldShowNotificationsForSharedPhotosAndAlbums();- if (_hasPermission) {+ if (toggleCurrent) {await service.setShouldShowNotificationsForSharedPhotosAndAlbums(!prev,@@ -116,9 +118,9 @@ class _NotificationSettingsScreenStatetrailing: ToggleSwitchComponent.async(value: () =>_hasPermission && service.shouldShowSocialNotifications(),- onChanged: () => _runWithPermission(() async {+ onChanged: () => _runWithPermission((toggleCurrent) async {final prev = service.shouldShowSocialNotifications();- if (_hasPermission) {+ if (toggleCurrent) {await service.setShouldShowSocialNotifications(!prev);} else if (!prev) {await service.setShouldShowSocialNotifications(true);@@ -137,9 +139,9 @@ class _NotificationSettingsScreenStatetrailing: ToggleSwitchComponent.async(value: () =>_hasPermission && localSettings.isOnThisDayNotificationsEnabled,- onChanged: () => _runWithPermission(() async {+ onChanged: () => _runWithPermission((toggleCurrent) async {final prev = localSettings.isOnThisDayNotificationsEnabled;- if (_hasPermission || !prev) {+ if (toggleCurrent || !prev) {await memoriesCacheService.toggleOnThisDayNotifications();}}),@@ -156,9 +158,9 @@ class _NotificationSettingsScreenStatetrailing: ToggleSwitchComponent.async(value: () =>_hasPermission && localSettings.birthdayNotificationsEnabled,- onChanged: () => _runWithPermission(() async {+ onChanged: () => _runWithPermission((toggleCurrent) async {final prev = localSettings.birthdayNotificationsEnabled;- if (_hasPermission || !prev) {+ if (toggleCurrent || !prev) {await memoriesCacheService.toggleBirthdayNotifications();}}),