π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos): preserve Android sync and serialize permission grants
laurenspriem7f9c88baea25
diff --git a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart b/mobile/apps/photos/lib/services/sync/remote_sync_service.dartindex 35b224f0be..207856cd0d 100644--- a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/remote_sync_service.dart@@ -104,10 +104,9 @@ class RemoteSyncService {_logger.info("Skipping remote sync since account is not configured");return;}- if (!LocalSyncService.instance.hasCompletedFirstImport()) {- if (Platform.isIOS) {- await permissionService.refreshPermissionState();- }+ if (Platform.isIOS &&+ !LocalSyncService.instance.hasCompletedFirstImport()) {+ await permissionService.refreshPermissionState();if (permissionService.hasGrantedPermissions()) {_logger.info("Deferring remote sync until first gallery import completes",diff --git a/mobile/apps/photos/lib/services/sync/sync_service.dart b/mobile/apps/photos/lib/services/sync/sync_service.dartindex e8fb4c344b..ae65da1aed 100644--- a/mobile/apps/photos/lib/services/sync/sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/sync_service.dart@@ -211,7 +211,11 @@ class SyncService {);return;}- _doSync().ignore();+ final runningSync = _existingSync?.future;+ if (runningSync != null) {+ await runningSync;+ }+ await sync();}void onDeviceCollectionSet(Set<int> collectionIDs) {