π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Fix pin ordering in Archive and Shared
r4khulab24e7024b9e
diff --git a/mobile/apps/photos/lib/services/collections_service.dart b/mobile/apps/photos/lib/services/collections_service.dartindex 10a3422160..ba48b5ff78 100644--- a/mobile/apps/photos/lib/services/collections_service.dart+++ b/mobile/apps/photos/lib/services/collections_service.dart@@ -688,7 +688,14 @@ class CollectionsService {outgoing.sort(comparator);- return SharedCollections(outgoing, incoming, quickLinks);+ return SharedCollections(+ [+ ...outgoing.where((collection) => collection.isPinned),+ ...outgoing.where((collection) => !collection.isPinned),+ ],+ incoming,+ quickLinks,+ );}Future<SharedCollectionsAndMemoryLinks>diff --git a/mobile/apps/photos/lib/ui/collections/collection_list_page.dart b/mobile/apps/photos/lib/ui/collections/collection_list_page.dartindex 678068bd75..6cc8e5d01e 100644--- a/mobile/apps/photos/lib/ui/collections/collection_list_page.dart+++ b/mobile/apps/photos/lib/ui/collections/collection_list_page.dart@@ -6,6 +6,7 @@ import 'package:flutter/material.dart';import "package:hugeicons/hugeicons.dart";import "package:photos/core/event_bus.dart";import "package:photos/events/album_sort_order_change_event.dart";+import "package:photos/events/collection_meta_event.dart";import "package:photos/events/collection_updated_event.dart";import 'package:photos/models/collection/collection.dart';import 'package:photos/models/collection/collection_items.dart';@@ -50,6 +51,7 @@ class CollectionListPage extends StatefulWidget {}class _CollectionListPageState extends State<CollectionListPage> {+ late StreamSubscription<CollectionMetaEvent> _collectionMetaEventSubscription;late StreamSubscription<CollectionUpdatedEvent>_collectionUpdatesSubscription;List<Collection>? collections;@@ -64,6 +66,16 @@ class _CollectionListPageState extends State<CollectionListPage> {void initState() {super.initState();collections = widget.collections;+ _collectionMetaEventSubscription = Bus.instance+ .on<CollectionMetaEvent>()+ .where((event) => event.type == CollectionMetaEventType.orderChanged)+ .listen((_) {+ if (widget.sectionType == UISectionType.archivedCollections ||+ widget.sectionType == UISectionType.incomingCollections ||+ widget.sectionType == UISectionType.outgoingCollections) {+ unawaited(refreshCollections());+ }+ });_collectionUpdatesSubscription = Bus.instance.on<CollectionUpdatedEvent>().listen((event) async {@@ -80,6 +92,7 @@ class _CollectionListPageState extends State<CollectionListPage> {@overridevoid dispose() {+ _collectionMetaEventSubscription.cancel();_collectionUpdatesSubscription.cancel();_scrollController.dispose();super.dispose();@@ -289,8 +302,15 @@ class _CollectionListPageState extends State<CollectionListPage> {).toList();}- if (widget.sectionType == UISectionType.archivedCollections ||- widget.sectionType == UISectionType.hiddenCollections) {+ if (widget.sectionType == UISectionType.archivedCollections) {+ final collectionsToOrder = collections!;+ final sortedCollections = await CollectionsService.instance+ .orderCollectionsForAlbums(collectionsToOrder);+ if (!mounted || !identical(collections, collectionsToOrder)) {+ return;+ }+ collections = sortedCollections;+ } else if (widget.sectionType == UISectionType.hiddenCollections) {await CollectionsService.instance.sortCollectionsByAlbumPreferences(collections!,sortKey: sortKey,diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/archive_page.dart b/mobile/apps/photos/lib/ui/viewer/gallery/archive_page.dartindex ddf9cb60f7..1223604832 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/archive_page.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/archive_page.dart@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';import 'package:photos/core/configuration.dart';import 'package:photos/core/event_bus.dart';import 'package:photos/db/files_db.dart';+import "package:photos/events/collection_meta_event.dart";import "package:photos/events/collection_updated_event.dart";import 'package:photos/events/files_updated_event.dart';import "package:photos/models/collection/collection.dart";@@ -44,12 +45,19 @@ class ArchivePage extends StatefulWidget {class _ArchivePageState extends State<ArchivePage> {final _selectedFiles = SelectedFiles();final _archivedCollections = <Collection>[];+ late StreamSubscription<CollectionMetaEvent> _collectionMetaEventSubscription;late StreamSubscription<CollectionUpdatedEvent>_collectionUpdatesSubscription;@overridevoid initState() {super.initState();+ _collectionMetaEventSubscription = Bus.instance+ .on<CollectionMetaEvent>()+ .where((event) => event.type == CollectionMetaEventType.orderChanged)+ .listen((_) {+ unawaited(_refreshArchivedCollections());+ });_collectionUpdatesSubscription = Bus.instance.on<CollectionUpdatedEvent>().listen((event) {@@ -60,6 +68,7 @@ class _ArchivePageState extends State<ArchivePage> {@overridevoid dispose() {+ _collectionMetaEventSubscription.cancel();_collectionUpdatesSubscription.cancel();super.dispose();}@@ -70,10 +79,16 @@ class _ArchivePageState extends State<ArchivePage> {if (!mounted) {return;}+ final userID = Configuration.instance.getUserID();+ bool isPinnedForCurrentUser(Collection collection) =>+ userID != null && !collection.isOwner(userID)+ ? collection.hasShareePinned()+ : collection.isPinned;setState(() {_archivedCollections..clear()- ..addAll(archivedCollections);+ ..addAll(archivedCollections.where(isPinnedForCurrentUser))+ ..addAll(archivedCollections.where((c) => !isPinnedForCurrentUser(c)));});}