π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos): finish local import before remote sync on iOS login
laurenspriemfeb5240a2bee
diff --git a/mobile/apps/photos/lib/services/permission/service.dart b/mobile/apps/photos/lib/services/permission/service.dartindex 114a129d67..eb4969da47 100644--- a/mobile/apps/photos/lib/services/permission/service.dart+++ b/mobile/apps/photos/lib/services/permission/service.dart@@ -47,10 +47,17 @@ class PermissionService {}Future<void> onUpdatePermission(PermissionState state) async {- await _prefs.setBool(kHasGrantedPermissionsKey, true);+ await _prefs.setBool(+ kHasGrantedPermissionsKey,+ state == PermissionState.authorized || state == PermissionState.limited,+ );await _prefs.setString(kPermissionStateKey, state.toString());}+ Future<void> refreshPermissionState() async {+ await onUpdatePermission(await getPermissionState());+ }+Future<PermissionState> getPermissionState() {return PhotoManager.getPermissionState(requestOption: const PermissionRequestOption(diff --git a/mobile/apps/photos/lib/services/sync/local_sync_service.dart b/mobile/apps/photos/lib/services/sync/local_sync_service.dartindex a7d5302302..72c62fdf2f 100644--- a/mobile/apps/photos/lib/services/sync/local_sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/local_sync_service.dart@@ -76,6 +76,13 @@ class LocalSyncService {}Future<void> sync() async {+ if (Platform.isIOS && Configuration.instance.hasConfiguredAccount()) {+ final hadPermission = permissionService.hasGrantedPermissions();+ await permissionService.refreshPermissionState();+ if (!hadPermission && permissionService.hasGrantedPermissions()) {+ Bus.instance.fire(PermissionGrantedEvent());+ }+ }if (!permissionService.hasGrantedPermissions()) {_logger.info("Skipping local sync since permission has not been granted");return;diff --git a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart b/mobile/apps/photos/lib/services/sync/remote_sync_service.dartindex 00457b3ae9..35b224f0be 100644--- a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/remote_sync_service.dart@@ -38,6 +38,7 @@ import 'package:photos/services/notification_service.dart';import 'package:photos/services/social_notification_coordinator.dart';import 'package:photos/services/social_sync_service.dart';import 'package:photos/services/sync/diff_fetcher.dart';+import 'package:photos/services/sync/local_sync_service.dart';import 'package:photos/services/sync/sync_service.dart';import 'package:photos/utils/network_util.dart';import 'package:shared_preferences/shared_preferences.dart';@@ -103,6 +104,17 @@ class RemoteSyncService {_logger.info("Skipping remote sync since account is not configured");return;}+ if (!LocalSyncService.instance.hasCompletedFirstImport()) {+ if (Platform.isIOS) {+ await permissionService.refreshPermissionState();+ }+ if (permissionService.hasGrantedPermissions()) {+ _logger.info(+ "Deferring remote sync until first gallery import completes",+ );+ return;+ }+ }if (_existingSync != null) {_logger.info("Remote sync already in progress, skipping");// A visible request upgrades an in-flight silent sync.diff --git a/mobile/apps/photos/lib/services/sync/sync_service.dart b/mobile/apps/photos/lib/services/sync/sync_service.dartindex f3751c6c18..e8fb4c344b 100644--- a/mobile/apps/photos/lib/services/sync/sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/sync_service.dart@@ -64,9 +64,6 @@ class SyncService {});Bus.instance.on<AccountConfiguredEvent>().listen((event) {- // This listener is only a transition hook for local-gallery -> online- // login. First import must have materialized local rows before remote- // sync can merge server files into them.if (!Configuration.instance.hasConfiguredAccount() ||isLocalGalleryMode) {_logger.info(@@ -74,12 +71,6 @@ class SyncService {);return;}- if (!_localSyncService.hasCompletedFirstImport()) {- _logger.info(- "Account configured event ignored; first gallery import is not completed",- );- return;- }if (isSyncInProgress()) {_logger.info("Account configured while sync is already in progress, skipping extra trigger",@@ -103,6 +94,12 @@ class SyncService {largeBackupSessionTracker.update(event);_logger.info("Sync status received " + event.toString());_lastSyncStatusEvent = event;+ if (event.status == SyncStatus.completedFirstGalleryImport &&+ Configuration.instance.hasConfiguredAccount() &&+ !isLocalGalleryMode &&+ !isSyncInProgress()) {+ unawaited(sync());+ }});}