π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Clarify hidden social collection context
ashilkn976fbeb92d6c
diff --git a/mobile/apps/photos/lib/ui/social/comments_screen.dart b/mobile/apps/photos/lib/ui/social/comments_screen.dartindex 884476e156..8a02f2dab3 100644--- a/mobile/apps/photos/lib/ui/social/comments_screen.dart+++ b/mobile/apps/photos/lib/ui/social/comments_screen.dart@@ -211,14 +211,16 @@ class _FileCommentsBottomSheetState extends State<FileCommentsBottomSheet> {super.dispose();}+ bool _isOpenedFromHiddenCollection() => CollectionsService.instance+ .getHiddenCollectionIds()+ .contains(widget.collectionID);+Future<void> _loadSharedCollections() async {final sharedCollectionsList =widget.sharedCollections ??await CollectionsService.instance.getSharedCollectionsForFile(widget.fileID,- includeHidden: CollectionsService.instance- .getHiddenCollectionIds()- .contains(widget.collectionID),+ includeHidden: _isOpenedFromHiddenCollection(),);// Fetch data in paralleldiff --git a/mobile/apps/photos/lib/ui/social/likes_bottom_sheet.dart b/mobile/apps/photos/lib/ui/social/likes_bottom_sheet.dartindex 5ec894df4e..a1a0bc5ebd 100644--- a/mobile/apps/photos/lib/ui/social/likes_bottom_sheet.dart+++ b/mobile/apps/photos/lib/ui/social/likes_bottom_sheet.dart@@ -79,15 +79,17 @@ class _LikesBottomSheetState extends State<LikesBottomSheet> {_loadSharedCollections();}+ bool _isOpenedFromHiddenCollection() => CollectionsService.instance+ .getHiddenCollectionIds()+ .contains(widget.initialCollectionID);+Future<void> _loadSharedCollections() async {try {final sharedCollectionsList =widget.sharedCollections ??await CollectionsService.instance.getSharedCollectionsForFile(widget.fileID,- includeHidden: CollectionsService.instance- .getHiddenCollectionIds()- .contains(widget.initialCollectionID),+ includeHidden: _isOpenedFromHiddenCollection(),);// Fetch like counts and thumbnails in paralleldiff --git a/mobile/apps/photos/lib/ui/social/widgets/file_social_overlay.dart b/mobile/apps/photos/lib/ui/social/widgets/file_social_overlay.dartindex 341a8e1c7e..09277d36e4 100644--- a/mobile/apps/photos/lib/ui/social/widgets/file_social_overlay.dart+++ b/mobile/apps/photos/lib/ui/social/widgets/file_social_overlay.dart@@ -92,7 +92,7 @@ class _FileSocialOverlayState extends State<FileSocialOverlay> {return mounted && refreshID == _latestRefreshID;}- bool get _includeHiddenCollections {+ bool _isOpenedFromHiddenCollection() {final openingCollectionID = widget.openingCollectionID;return openingCollectionID != null &&CollectionsService.instance.getHiddenCollectionIds().contains(@@ -116,7 +116,7 @@ class _FileSocialOverlayState extends State<FileSocialOverlay> {final collectionIDs = await CollectionsService.instance.getSharedCollectionIDsForFile(fileID,- includeHidden: _includeHiddenCollections,+ includeHidden: _isOpenedFromHiddenCollection(),);if (!_isCurrentSocialRefresh(refreshID)) {return;@@ -204,7 +204,7 @@ class _FileSocialOverlayState extends State<FileSocialOverlay> {final sharedCollections = await CollectionsService.instance.getSharedCollectionsForFile(fileID,- includeHidden: _includeHiddenCollections,+ includeHidden: _isOpenedFromHiddenCollection(),);if (!mounted ||widget.file.uploadedFileID != fileID ||@@ -307,7 +307,7 @@ class _FileSocialOverlayState extends State<FileSocialOverlay> {final sharedCollections = await CollectionsService.instance.getSharedCollectionsForFile(fileID,- includeHidden: _includeHiddenCollections,+ includeHidden: _isOpenedFromHiddenCollection(),);if (!mounted ||widget.file.uploadedFileID != fileID ||@@ -334,7 +334,7 @@ class _FileSocialOverlayState extends State<FileSocialOverlay> {final sharedCollections = await CollectionsService.instance.getSharedCollectionsForFile(fileID,- includeHidden: _includeHiddenCollections,+ includeHidden: _isOpenedFromHiddenCollection(),);if (!mounted ||widget.file.uploadedFileID != fileID ||