π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] allow removal from quick links and Favorites in file info
r4khul853d1e587c97
diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/albums_item_widget.dart b/mobile/apps/photos/lib/ui/viewer/file_details/albums_item_widget.dartindex 5379ebe5bd..3c5fc73882 100644--- a/mobile/apps/photos/lib/ui/viewer/file_details/albums_item_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file_details/albums_item_widget.dart@@ -12,9 +12,11 @@ import 'package:photos/models/collection/collection_items.dart';import 'package:photos/models/file/file.dart';import "package:photos/models/selected_files.dart";import "package:photos/services/collections_service.dart";+import "package:photos/services/favorites_service.dart";import "package:photos/ui/actions/collection/collection_file_actions.dart";import "package:photos/ui/actions/collection/collection_sharing_actions.dart";import "package:photos/ui/collections/collection_action_sheet.dart";+import "package:photos/ui/notification/toast.dart";import "package:photos/ui/viewer/gallery/collection_page.dart";class AlbumsItemWidget extends StatefulWidget {@@ -112,7 +114,9 @@ class _AlbumsItemWidgetState extends State<AlbumsItemWidget> {);},onRemove: _canRemoveFrom(c)- ? () => _removeFromCollection(context, c)+ ? () => c.type == CollectionType.favorites+ ? _removeFromFavorites(context)+ : _removeFromCollection(context, c): null,),);@@ -153,17 +157,33 @@ class _AlbumsItemWidgetState extends State<AlbumsItemWidget> {bool _canRemoveFrom(Collection collection) {if (collection.type == CollectionType.uncategorized ||- collection.type == CollectionType.favorites ||- collection.isQuickLinkCollection() ||collection.isDefaultHidden()) {return false;}+ if (collection.type == CollectionType.favorites) {+ return collection.isOwner(widget.currentUserID);+ }return widget.file.ownerID == widget.currentUserID ||CollectionsService.instance.canRemoveFilesFromAllParticipants(collection,);}+ Future<void> _removeFromFavorites(BuildContext context) async {+ try {+ await FavoritesService.instance.removeFromFavorites(context, widget.file);+ if (mounted) setState(() {});+ } catch (e, s) {+ Logger("AlbumsItemWidget").severe("Failed to remove favorite", e, s);+ if (context.mounted) {+ showShortToast(+ context,+ context.strings.sorryCouldNotRemoveFromFavorites,+ );+ }+ }+ }+Future<void> _removeFromCollection(BuildContext context,Collection collection,diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/favorite_widget.dart b/mobile/apps/photos/lib/ui/viewer/file_details/favorite_widget.dartindex 3ad169c9b0..48a623c3e2 100644--- a/mobile/apps/photos/lib/ui/viewer/file_details/favorite_widget.dart+++ b/mobile/apps/photos/lib/ui/viewer/file_details/favorite_widget.dart@@ -6,6 +6,8 @@ import "package:ente_strings/ente_strings.dart";import "package:flutter/material.dart";import "package:flutter/services.dart";import "package:logging/logging.dart";+import "package:photos/core/event_bus.dart";+import "package:photos/events/local_photos_updated_event.dart";import "package:photos/models/file/file.dart";import "package:photos/services/favorites_service.dart";import "package:photos/theme/ente_theme.dart";@@ -38,6 +40,8 @@ class _FavoriteWidgetState extends State<FavoriteWidget>bool _isUpdating = false;bool? _isFavorite;int _fileVersion = 0;+ late final StreamSubscription<LocalPhotosUpdatedEvent>+ _favoriteUpdatesSubscription;@overridevoid initState() {@@ -91,6 +95,19 @@ class _FavoriteWidgetState extends State<FavoriteWidget>weight: 12,),]).animate(_favoriteAnimationController);+ _favoriteUpdatesSubscription = Bus.instance+ .on<LocalPhotosUpdatedEvent>()+ .where(+ (event) =>+ event.source == "favoriteAdd" || event.source == "favoriteRemove",+ )+ .listen((event) {+ if (event.updatedFiles.any(+ (file) => file.uploadedFileID == widget.file.uploadedFileID,+ )) {+ _initializeFavoriteState();+ }+ });_initializeFavoriteState();}@@ -117,6 +134,7 @@ class _FavoriteWidgetState extends State<FavoriteWidget>@overridevoid dispose() {+ _favoriteUpdatesSubscription.cancel();_favoriteAnimationController.dispose();super.dispose();}