Skip to content

armgit / ente

Public Imported from GitHub
0

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

Fix stale face suggestions after preview removals

laurenspriema3297eeaec92
diff --git a/mobile/apps/photos/changes/face-suggestion-deletion-refresh.md b/mobile/apps/photos/changes/face-suggestion-deletion-refresh.md
new file mode 100644
index 0000000000..a4ddf0d62f
--- /dev/null
+++ b/mobile/apps/photos/changes/face-suggestion-deletion-refresh.md
@@ -0,0 +1 @@
+- Refresh face suggestions after deleting or hiding photos in their preview, so removed photos cannot be reopened from a stale suggestion.
diff --git a/mobile/apps/photos/lib/ui/viewer/people/cluster_page.dart b/mobile/apps/photos/lib/ui/viewer/people/cluster_page.dart
index 319f90c14b..d500608e43 100644
--- a/mobile/apps/photos/lib/ui/viewer/people/cluster_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/people/cluster_page.dart
@@ -42,6 +42,7 @@ class ClusterPage extends StatefulWidget {
final PersonEntity? personID;
final String appendTitle;
final bool showNamingBanner;
+ final VoidCallback? onFilesChanged;
static const GalleryType appBarType = GalleryType.cluster;
static const GalleryType overlayType = GalleryType.cluster;
@@ -55,6 +56,7 @@ class ClusterPage extends StatefulWidget {
this.personID,
this.appendTitle = "",
this.showNamingBanner = true,
+ this.onFilesChanged,
super.key,
});
@@ -91,6 +93,7 @@ class _ClusterPageState extends State<ClusterPage> {
for (var updatedFile in event.updatedFiles) {
files.remove(updatedFile);
}
+ widget.onFilesChanged?.call();
setState(() {});
}
});
@@ -100,6 +103,7 @@ class _ClusterPageState extends State<ClusterPage> {
for (var updatedFile in event.relevantFiles!) {
files.remove(updatedFile);
}
+ widget.onFilesChanged?.call();
setState(() {});
}
if (event.type == PeopleEventType.removedFaceFromCluster) {
@@ -107,6 +111,7 @@ class _ClusterPageState extends State<ClusterPage> {
final int fileID = getFileIdFromFaceId<int>(removedFaceID);
files.removeWhere((file) => file.uploadedFileID == fileID);
}
+ widget.onFilesChanged?.call();
setState(() {});
}
}
diff --git a/mobile/apps/photos/lib/ui/viewer/people/person_gallery_suggestion.dart b/mobile/apps/photos/lib/ui/viewer/people/person_gallery_suggestion.dart
index 08ac6f7ba4..e9f1a84ea4 100644
--- a/mobile/apps/photos/lib/ui/viewer/people/person_gallery_suggestion.dart
+++ b/mobile/apps/photos/lib/ui/viewer/people/person_gallery_suggestion.dart
@@ -225,11 +225,13 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>
}
Future<void> _navigateToCluster() async {
- if (allSuggestions.isEmpty ||
+ if (isProcessing ||
+ allSuggestions.isEmpty ||
currentSuggestionIndex >= allSuggestions.length) {
return;
}
+ var filesChanged = false;
final currentSuggestion = allSuggestions[currentSuggestionIndex];
final List<EnteFile> sortedFiles = List<EnteFile>.from(
currentSuggestion.filesInCluster,
@@ -242,15 +244,20 @@ class _PersonGallerySuggestionState extends State<PersonGallerySuggestion>
personID: relevantPerson,
clusterID: currentSuggestion.clusterIDToMerge,
showNamingBanner: false,
+ onFilesChanged: () => filesChanged = true,
),
),
);
- if (!mounted || result != ClusterPageResult.ignoredPerson) {
+ if (!mounted) {
return;
}
- await _consumeCurrentSuggestionAfterExternalAction();
+ if (filesChanged) {
+ await _reloadSuggestions();
+ } else if (result == ClusterPageResult.ignoredPerson) {
+ await _consumeCurrentSuggestionAfterExternalAction();
+ }
}
Future<void> _consumeCurrentSuggestionAfterExternalAction() async {