π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mob][locker] Deduplicate files across matching collections (#13989)
aman-pilotdb33d678b103
diff --git a/mobile/apps/locker/changes/search-duplicate-results.md b/mobile/apps/locker/changes/search-duplicate-results.mdnew file mode 100644index 0000000000..0d6c88e689--- /dev/null+++ b/mobile/apps/locker/changes/search-duplicate-results.md@@ -0,0 +1 @@+- Fixed duplicate files in search results.diff --git a/mobile/apps/locker/lib/ui/mixins/search_mixin.dart b/mobile/apps/locker/lib/ui/mixins/search_mixin.dartindex d4ce503421..9f3c02adb4 100644--- a/mobile/apps/locker/lib/ui/mixins/search_mixin.dart+++ b/mobile/apps/locker/lib/ui/mixins/search_mixin.dart@@ -104,6 +104,7 @@ mixin SearchMixin<T extends StatefulWidget> on State<T> {final List<Collection> filteredCollections = [];final List<EnteFile> collectionFiles = [];+ final Set<String> addedFileIds = {};for (final collection in allCollections) {if (!mounted) return;@@ -114,14 +115,15 @@ mixin SearchMixin<T extends StatefulWidget> on State<T> {if (searchResult.matches) {filteredCollections.add(collection);if (searchResult.nameMatches) {- collectionFiles.addAll(searchResult.files);+ collectionFiles.addAll(+ searchResult.files.where(+ (file) => addedFileIds.add(file.uploadedFileID.toString()),+ ),+ );}}}- final Set<String> addedFileIds = collectionFiles- .map((f) => f.uploadedFileID.toString())- .toSet();final filteredFiles = allFiles.where((file) {if (addedFileIds.contains(file.uploadedFileID.toString())) {return false;