Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Fix received album sharing navigation

AmanRajSinghMouryace09c1508487
diff --git a/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart b/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart
index 657c5f7f4e..3b644bb7ed 100644
--- a/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart
+++ b/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart
@@ -11,7 +11,6 @@ import 'package:photos/models/collection/collection.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
import 'package:photos/ui/sharing/add_people_sheet.dart';
-import 'package:photos/ui/sharing/album_participants_page.dart';
import 'package:photos/ui/sharing/manage_links_widget.dart';
import 'package:photos/ui/sharing/public_link_enabled_actions_widget.dart';
import 'package:photos/ui/sharing/share_components.dart';
@@ -34,7 +33,6 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
CollectionsService.instance,
);
final GlobalKey sendLinkButtonKey = GlobalKey();
- bool _redirectedToParticipants = false;
@override
void initState() {
@@ -68,22 +66,6 @@ class _ShareCollectionPageState extends State<ShareCollectionPage> {
@override
Widget build(BuildContext context) {
final int userID = Configuration.instance.getUserID() ?? -1;
-
- if (!_redirectedToParticipants) {
- final bool isOwner = _collection.owner.id == userID;
- if (!isOwner) {
- _redirectedToParticipants = true;
- WidgetsBinding.instance.addPostFrameCallback((_) {
- if (!mounted) {
- return;
- }
- replacePage(context, AlbumParticipantsPage(_collection));
- });
- } else {
- _redirectedToParticipants = true;
- }
- }
-
final bool hasUrl = _collection.hasLink;
final bool isOwner = _collection.owner.id == userID;
if (isOwner && _collection.owner.email.isEmpty) {
diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
index 74b34eb6b7..3ca3eb9869 100644
--- a/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
@@ -1223,12 +1223,8 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
}
final int? userID = Configuration.instance.getUserID();
final bool isOwner = userID == collection.owner.id;
- final CollectionParticipantRole role = collection.getRole(userID ?? -1);
- final bool isAdmin = role == CollectionParticipantRole.admin;
- final bool canManageParticipants = isOwner || isAdmin;
- if (canManageParticipants) {
- final bool shouldOpenManageLink =
- isOwner && isQuickLink && collection.hasLink;
+ if (isOwner) {
+ final bool shouldOpenManageLink = isQuickLink && collection.hasLink;
unawaited(
routeToPage(
context,
@@ -1237,8 +1233,6 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
: ShareCollectionPage(collection),
),
);
- } else if (collection.hasLink) {
- unawaited(routeToPage(context, ShareCollectionPage(collection)));
} else {
unawaited(routeToPage(context, AlbumParticipantsPage(collection)));
}