Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][photos] handle added clusters cleanup in memory lane service

Priyanshu Dangaredc3f6a60b087
diff --git a/mobile/apps/photos/lib/events/people_changed_event.dart b/mobile/apps/photos/lib/events/people_changed_event.dart
index 4d6c9e5bdb..78453b4649 100644
--- a/mobile/apps/photos/lib/events/people_changed_event.dart
+++ b/mobile/apps/photos/lib/events/people_changed_event.dart
@@ -8,6 +8,7 @@ class PeopleChangedEvent extends Event {
final PeopleEventType type;
final String source;
final PersonEntity? person;
+ final Set<String>? clusterIDs;
PeopleChangedEvent({
this.relevantFiles,
@@ -15,6 +16,7 @@ class PeopleChangedEvent extends Event {
this.type = PeopleEventType.defaultType,
this.source = "",
this.person,
+ this.clusterIDs,
});
@override
diff --git a/mobile/apps/photos/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart b/mobile/apps/photos/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
index 020b53d5b9..7bef372974 100644
--- a/mobile/apps/photos/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
+++ b/mobile/apps/photos/lib/services/machine_learning/face_ml/feedback/cluster_feedback.dart
@@ -1276,7 +1276,8 @@ class ClusterFeedbackService<T> {
Bus.instance.fire(
PeopleChangedEvent(
type: PeopleEventType.automaticallyMergedClustersIntoPerson,
- person: await PersonService.instance.getPerson(p.remoteID),
+ person: p,
+ clusterIDs: suggestions.map((s) => s.$1).toSet(),
),
);
}
diff --git a/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart b/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
index d23adc0af6..ec2f2a01c5 100644
--- a/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
+++ b/mobile/apps/photos/lib/services/memory_lane/memory_lane_service.dart
@@ -852,6 +852,7 @@ class MemoryLaneService {
if (event.type == PeopleEventType.addedClusterToPerson) {
clusterIDs.add(event.source);
}
+ clusterIDs.addAll(event.clusterIDs ?? {});
if (event.person case final person?) {
clusterIDs.addAll(person.data.assigned.map((cluster) => cluster.id));
}