π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Fix smart album person sync ordering
laurenspriem8d6f3fe5c50e
diff --git a/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_service.dart b/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_service.dartindex 84533eaac3..88da7a6b2e 100644--- a/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_service.dart+++ b/mobile/apps/photos/lib/services/machine_learning/face_ml/person/person_service.dart@@ -339,6 +339,7 @@ class PersonService {final persons = await getPersonsMap();w?.log("Got persons");int orphanMappingsRemoved = 0;+ final entityUpdates = <Future<LocalEntityData>>[];for (var personID in dbPersonClusterInfo.keys) {final person = persons[personID];if (person == null) {@@ -388,23 +389,31 @@ class PersonService {continue;}+ var updatedPersonData = personData;if (shouldUpdateAssigned) {- personData.assigned = dbPersonCluster.entries- .map((e) => ClusterInfo(id: e.key, faces: e.value))- .toList();+ updatedPersonData = updatedPersonData.copyWith(+ assigned: dbPersonCluster.entries+ .map((e) => ClusterInfo(id: e.key, faces: e.value))+ .toList(),+ );}if (shouldUpdateManualAssignments) {- personData.manuallyAssigned = updatedManualAssignments ?? <int>[];+ updatedPersonData = updatedPersonData.copyWith(+ manuallyAssigned: updatedManualAssignments ?? <int>[],+ );}- _addOrUpdateEntity(- EntityType.cgroup,- personData.toJson(),- id: personID,- ).ignore();- personData.logStats();+ entityUpdates.add(+ _addOrUpdateEntity(+ EntityType.cgroup,+ updatedPersonData.toJson(),+ id: personID,+ ),+ );+ updatedPersonData.logStats();}+ await Future.wait(entityUpdates);if (orphanMappingsRemoved > 0) {logger.warning("Removed $orphanMappingsRemoved orphaned local person mappings during reconcile",diff --git a/mobile/apps/photos/lib/services/machine_learning/ml_service.dart b/mobile/apps/photos/lib/services/machine_learning/ml_service.dartindex 2721d5e351..4847b50130 100644--- a/mobile/apps/photos/lib/services/machine_learning/ml_service.dart+++ b/mobile/apps/photos/lib/services/machine_learning/ml_service.dart@@ -473,6 +473,11 @@ class MLService {_logRunStopped(control, "before post-run cache scheduling");return MlRunDisposition.stopped;}+ await PersonService.instance.sync();+ if (control.stopRequested) {+ _logRunStopped(control, "after post-run person sync");+ return MlRunDisposition.stopped;+ }if (_mlControllerStatus == true) {// Persist refreshed caches after ML so foreground can pick them up// on the next resume, even when the work ran headlessly in background.