π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
fix(photos): keep onboarding choice on iOS relogin
laurenspriemc91ea351f844
diff --git a/mobile/apps/photos/lib/services/permission/service.dart b/mobile/apps/photos/lib/services/permission/service.dartindex 3dc989bfbf..c05cc3acb5 100644--- a/mobile/apps/photos/lib/services/permission/service.dart+++ b/mobile/apps/photos/lib/services/permission/service.dart@@ -51,10 +51,6 @@ class PermissionService {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 78f3513a67..a7d5302302 100644--- a/mobile/apps/photos/lib/services/sync/local_sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/local_sync_service.dart@@ -76,20 +76,6 @@ class LocalSyncService {}Future<void> sync() async {- if (Platform.isIOS && Configuration.instance.hasConfiguredAccount()) {- final hadPermission = permissionService.hasGrantedPermissions();- await permissionService.refreshPermissionState();- if (permissionService.hasGrantedLimitedPermissions() &&- !hasCompletedFirstImport() &&- !backupPreferenceService.hasSelectedAnyBackupFolder &&- !backupPreferenceService.hasManualFolderSelection &&- !backupPreferenceService.hasSkippedOnboardingPermission) {- await backupPreferenceService.setSelectAllFoldersForBackup(true);- }- 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 207856cd0d..dc8d393e86 100644--- a/mobile/apps/photos/lib/services/sync/remote_sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/remote_sync_service.dart@@ -105,14 +105,12 @@ class RemoteSyncService {return;}if (Platform.isIOS &&- !LocalSyncService.instance.hasCompletedFirstImport()) {- await permissionService.refreshPermissionState();- if (permissionService.hasGrantedPermissions()) {- _logger.info(- "Deferring remote sync until first gallery import completes",- );- return;- }+ !LocalSyncService.instance.hasCompletedFirstImport() &&+ permissionService.hasGrantedPermissions()) {+ _logger.info(+ "Deferring remote sync until first gallery import completes",+ );+ return;}if (_existingSync != null) {_logger.info("Remote sync already in progress, skipping");diff --git a/mobile/apps/photos/lib/services/sync/sync_service.dart b/mobile/apps/photos/lib/services/sync/sync_service.dartindex deb1e8d2e1..708d8302c0 100644--- a/mobile/apps/photos/lib/services/sync/sync_service.dart+++ b/mobile/apps/photos/lib/services/sync/sync_service.dart@@ -64,6 +64,9 @@ 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(@@ -71,6 +74,12 @@ 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",