Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Let local gallery entry retry after a failed write

r4khul78c0391bc019
diff --git a/mobile/apps/photos/lib/services/app_lifecycle_service.dart b/mobile/apps/photos/lib/services/app_lifecycle_service.dart
index 594c364063..dc095efdbc 100644
--- a/mobile/apps/photos/lib/services/app_lifecycle_service.dart
+++ b/mobile/apps/photos/lib/services/app_lifecycle_service.dart
@@ -29,7 +29,9 @@ class AppLifecycleService {
Future<void> get preferencesReloaded => _preferencesReload;
Future<void> reloadPreferences() {
- _preferencesReload = _preferences.reload();
+ _preferencesReload = _preferences.reload().catchError((Object e) {
+ _logger.warning("Failed to reload preferences", e);
+ });
return _preferencesReload;
}
diff --git a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart
index 5853bca1ce..f9f7e4fddf 100644
--- a/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart
+++ b/mobile/apps/photos/lib/ui/home/grant_permissions_widget.dart
@@ -256,13 +256,18 @@ class _GrantPermissionsWidgetState extends State<GrantPermissionsWidget>
return;
}
_isEnteringLocalGallery = true;
- await AppLifecycleService.instance.preferencesReloaded;
- await localSettings.setAppMode(AppMode.localGallery);
- localSettings.localGalleryModeEnabledThisSession = true;
- await setMLConsent(true);
- Bus.instance.fire(AppModeChangedEvent());
- await permissionService.onUpdatePermission(state);
- await localSettings.setLocalGalleryOnboardingPending(false);
+ try {
+ await AppLifecycleService.instance.preferencesReloaded;
+ await localSettings.setAppMode(AppMode.localGallery);
+ localSettings.localGalleryModeEnabledThisSession = true;
+ await setMLConsent(true);
+ Bus.instance.fire(AppModeChangedEvent());
+ await permissionService.onUpdatePermission(state);
+ await localSettings.setLocalGalleryOnboardingPending(false);
+ } catch (e) {
+ _isEnteringLocalGallery = false;
+ rethrow;
+ }
SyncService.instance.onPermissionGranted().ignore();
Bus.instance.fire(PermissionGrantedEvent());
try {