π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Fix filtering inside hidden albums
laurenspriembd8fb14447bb
diff --git a/mobile/apps/photos/changes/hidden-album-filters.md b/mobile/apps/photos/changes/hidden-album-filters.mdnew file mode 100644index 0000000000..733779e9a7--- /dev/null+++ b/mobile/apps/photos/changes/hidden-album-filters.md@@ -0,0 +1 @@+- Fixed Photos, Videos, and Live Photos filters showing empty results in hidden albums.diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/collection_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/collection_page.dartindex 19ca854b9e..fe42699837 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/collection_page.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/collection_page.dart@@ -147,6 +147,9 @@ class CollectionPage extends StatelessWidget {tagPrefix: tagPrefix,selectedFiles: _selectedFiles,appBar: appBar,+ hiddenCollectionID: c.collection.isHidden()+ ? c.collection.id+ : null,): gallery;},diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/hierarchical_search_gallery.dart b/mobile/apps/photos/lib/ui/viewer/gallery/hierarchical_search_gallery.dartindex 39daa64a22..19b029762d 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/hierarchical_search_gallery.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/hierarchical_search_gallery.dart@@ -29,10 +29,12 @@ class HierarchicalSearchGallery extends StatefulWidget {final String tagPrefix;final SelectedFiles? selectedFiles;final GalleryAppBarConfig? appBar;+ final int? hiddenCollectionID;const HierarchicalSearchGallery({required this.tagPrefix,this.selectedFiles,this.appBar,+ this.hiddenCollectionID,super.key,});@@ -103,7 +105,10 @@ class _HierarchicalSearchGalleryState extends State<HierarchicalSearchGallery> {}_isLoading.value = true;- final filterdFiles = await getFilteredFiles(filters);+ final filterdFiles = await getFilteredFiles(+ filters,+ hiddenCollectionID: widget.hiddenCollectionID,+ );_setFilteredFiles(filterdFiles);if (!mounted) return;diff --git a/mobile/apps/photos/lib/utils/hierarchical_search_util.dart b/mobile/apps/photos/lib/utils/hierarchical_search_util.dartindex 2ed9667983..86b85d80a2 100644--- a/mobile/apps/photos/lib/utils/hierarchical_search_util.dart+++ b/mobile/apps/photos/lib/utils/hierarchical_search_util.dart@@ -25,6 +25,7 @@ import "package:photos/models/search/hierarchical/uploader_filter.dart";import "package:photos/service_locator.dart";import "package:photos/services/collections_service.dart";import "package:photos/services/contacts/contact_identity_resolver.dart";+import "package:photos/services/filter/db_filters.dart";import "package:photos/services/machine_learning/face_ml/face_filtering/face_filtering_constants.dart";import "package:photos/services/machine_learning/face_ml/person/person_service.dart";import "package:photos/services/magic_cache_service.dart";@@ -77,19 +78,31 @@ Future<void> _hydrateFaceFilterMatches(FaceFilter filter) async {}Future<List<EnteFile>> getFilteredFiles(- List<HierarchicalSearchFilter> filters,-) async {+ List<HierarchicalSearchFilter> filters, {+ int? hiddenCollectionID,+}) async {final logger = Logger("HierarchicalSearchUtil");final mlDataDB = MLDataDB.instance;late final List<EnteFile> filteredFiles;- final files = await SearchService.instance.getAllFilesForHierarchicalSearch();+ final files = hiddenCollectionID == null+ ? await SearchService.instance.getAllFilesForHierarchicalSearch()+ : (await FilesDB.instance.getFilesInCollection(+ hiddenCollectionID,+ galleryLoadStartTime,+ galleryLoadEndTime,+ )).files;final resultsNeverComputedFilters = <HierarchicalSearchFilter>[];- final ignoredCollections = CollectionsService.instance- .getHiddenCollectionIds();logger.info("Getting filtered files for Filters: $filters");for (HierarchicalSearchFilter filter in filters) {- if (filter is FaceFilter && filter.matchedUploadedIDs.isEmpty) {+ if (hiddenCollectionID != null &&+ filter is AlbumFilter &&+ filter.collectionID != hiddenCollectionID &&+ filter.matchedUploadedIDs.isEmpty) {+ final uploadedIDs = await FilesDB.instance+ .getUploadedFileIDsInCollections({filter.collectionID});+ filter.matchedUploadedIDs.addAll(uploadedIDs);+ } else if (filter is FaceFilter && filter.matchedUploadedIDs.isEmpty) {try {await _hydrateFaceFilterMatches(filter);} catch (e) {@@ -181,11 +194,21 @@ Future<List<EnteFile>> getFilteredFiles(}}- filteredFiles = await FilesDB.instance.getFilesFromIDs(- filteredUploadedIDs.toList(),- dedupeByUploadId: true,- collectionsToIgnore: ignoredCollections,- );+ if (hiddenCollectionID != null) {+ filteredFiles = await applyDBFilters(+ files+ .where((file) => filteredUploadedIDs.contains(file.uploadedFileID))+ .toList(),+ DBFilterOptions(dedupeUploadID: true),+ );+ } else {+ filteredFiles = await FilesDB.instance.getFilesFromIDs(+ filteredUploadedIDs.toList(),+ dedupeByUploadId: true,+ collectionsToIgnore: CollectionsService.instance+ .getHiddenCollectionIds(),+ );+ }} catch (e) {Logger("HierarchicalSearchUtil").severe("Failed to get filtered files: $e");}