π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][photos] Wait for the resume preference reload before entering local gallery
r4khulf2e8df9f567d
diff --git a/mobile/apps/photos/lib/app.dart b/mobile/apps/photos/lib/app.dartindex e19c9dd683..32d0a16b80 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 ServiceLocator.instance.prefs.reload();+ await AppLifecycleService.instance.reloadPreferences();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 0503b4813e..594c364063 100644--- a/mobile/apps/photos/lib/services/app_lifecycle_service.dart+++ b/mobile/apps/photos/lib/services/app_lifecycle_service.dart@@ -11,6 +11,7 @@ class AppLifecycleService {final _logger = Logger("AppLifecycleService");bool isForeground = false;+ Future<void> _preferencesReload = Future<void>.value();MediaExtentionAction mediaExtensionAction = MediaExtentionAction(action: IntentAction.main,);@@ -25,6 +26,13 @@ class AppLifecycleService {_preferences = preferences;}+ Future<void> get preferencesReloaded => _preferencesReload;++ Future<void> reloadPreferences() {+ _preferencesReload = _preferences.reload();+ 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 9f6008f2bd..5853bca1ce 100644--- a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart+++ b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart@@ -15,6 +15,7 @@ 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';@@ -255,6 +256,7 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget>return;}_isEnteringLocalGallery = true;+ await AppLifecycleService.instance.preferencesReloaded;await localSettings.setAppMode(AppMode.localGallery);localSettings.localGalleryModeEnabledThisSession = true;await setMLConsent(true);