π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Remove preference reload coordination from gallery entry
r4khul48090d5ee14a
diff --git a/mobile/apps/photos/changes/local-gallery-permission-recovery.md b/mobile/apps/photos/changes/local-gallery-permission-recovery.mdindex 336431a5dc..6b5d3d5631 100644--- a/mobile/apps/photos/changes/local-gallery-permission-recovery.md+++ b/mobile/apps/photos/changes/local-gallery-permission-recovery.md@@ -1 +1 @@-- Local gallery setup now reliably keeps photo access granted from the system prompt or settings, and tapping Continue again after a denial opens settings.+- Local gallery setup now remembers when you continue without an account, and you can retry photo access after a denial.diff --git a/mobile/apps/photos/lib/app.dart b/mobile/apps/photos/lib/app.dartindex 32d0a16b80..e19c9dd683 100644--- a/mobile/apps/photos/lib/app.dart+++ b/mobile/apps/photos/lib/app.dart@@ -286,7 +286,7 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {Future<void> _reloadCachesUpdatedInBackground(int lastAppOpenTimeInMicroseconds,) async {- await AppLifecycleService.instance.reloadPreferences();+ await ServiceLocator.instance.prefs.reload();final futures = <Future<void>>[];if (magicCacheService.lastMagicCacheUpdateTimeInMicroseconds >diff --git a/mobile/apps/photos/lib/services/app_lifecycle_service.dart b/mobile/apps/photos/lib/services/app_lifecycle_service.dartindex dc095efdbc..0503b4813e 100644--- a/mobile/apps/photos/lib/services/app_lifecycle_service.dart+++ b/mobile/apps/photos/lib/services/app_lifecycle_service.dart@@ -11,7 +11,6 @@ class AppLifecycleService {final _logger = Logger("AppLifecycleService");bool isForeground = false;- Future<void> _preferencesReload = Future<void>.value();MediaExtentionAction mediaExtensionAction = MediaExtentionAction(action: IntentAction.main,);@@ -26,15 +25,6 @@ class AppLifecycleService {_preferences = preferences;}- Future<void> get preferencesReloaded => _preferencesReload;-- Future<void> reloadPreferences() {- _preferencesReload = _preferences.reload().catchError((Object e) {- _logger.warning("Failed to reload preferences", e);- });- return _preferencesReload;- }-void setMediaExtensionAction(MediaExtentionAction mediaExtensionAction) {_logger.info("App invoked via ${mediaExtensionAction.action}");this.mediaExtensionAction = mediaExtensionAction;diff --git a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dartindex 860404d4f3..2e59cf8d1b 100644--- a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart+++ b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart@@ -15,7 +15,6 @@ import "package:photos/core/event_bus.dart";import "package:photos/events/app_mode_changed_event.dart";import "package:photos/events/permission_granted_event.dart";import "package:photos/service_locator.dart";-import "package:photos/services/app_lifecycle_service.dart";import "package:photos/services/machine_learning/ml_service.dart";import "package:photos/services/machine_learning/semantic_search/semantic_search_service.dart";import 'package:photos/services/sync/sync_service.dart';@@ -225,7 +224,6 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget>final state = await permissionService.requestPhotoMangerPermissions();_logger.info("Offline permission state: $state");if (state.hasAccess) {- // Otherwise the resume check enters after the preference reload.if (WidgetsBinding.instance.lifecycleState ==AppLifecycleState.resumed) {await _enterLocalGallery(state);@@ -257,15 +255,11 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget>}Future<void> _enterLocalGallery(PermissionState state) async {- if (_isEnteringLocalGallery) {+ if (!mounted || !widget.startWithoutAccount || _isEnteringLocalGallery) {return;}_isEnteringLocalGallery = true;try {- await AppLifecycleService.instance.preferencesReloaded;- if (!mounted || !widget.startWithoutAccount) {- return;- }await localSettings.setAppMode(AppMode.localGallery);localSettings.localGalleryModeEnabledThisSession = true;try {