diff --git a/mobile/apps/photos/lib/services/collections_service.dart b/mobile/apps/photos/lib/services/collections_service.dart index 43179ab2d6..0ca65d8bc6 100644 --- a/mobile/apps/photos/lib/services/collections_service.dart +++ b/mobile/apps/photos/lib/services/collections_service.dart @@ -753,6 +753,15 @@ class CollectionsService { return _cachedKeys[collectionID]!; } + String getPublicUrl(Collection c) { + final PublicURL url = c.publicURLs.firstOrNull!; + final String collectionKey = Base58Encode( + CollectionsService.instance.getCollectionKey(c.id), + ); + final String urlValue = "${url.url}#$collectionKey"; + return urlValue; + } + Uint8List _getAndCacheDecryptedKey( Collection collection, { String source = "", diff --git a/mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart b/mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart index dfea026297..8943613eac 100644 --- a/mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart +++ b/mobile/apps/photos/lib/ui/sharing/manage_links_widget.dart @@ -2,7 +2,6 @@ import 'dart:convert'; import 'package:collection/collection.dart'; import 'package:ente_crypto/ente_crypto.dart'; -import "package:fast_base58/fast_base58.dart"; import 'package:flutter/material.dart'; import "package:flutter/services.dart"; import "package:photos/generated/l10n.dart"; @@ -54,10 +53,8 @@ class _ManageSharedLinkWidgetState extends State { widget.collection!.publicURLs.firstOrNull?.passwordEnabled ?? false; final enteColorScheme = getEnteColorScheme(context); final PublicURL url = widget.collection!.publicURLs.firstOrNull!; - final String collectionKey = Base58Encode( - CollectionsService.instance.getCollectionKey(widget.collection!.id), - ); - final String urlValue = "${url.url}#$collectionKey"; + final String urlValue = + CollectionsService.instance.getPublicUrl(widget.collection!); return Scaffold( appBar: AppBar( elevation: 0, 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 0b1ab33bb9..a166738320 100644 --- a/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart +++ b/mobile/apps/photos/lib/ui/sharing/share_collection_page.dart @@ -1,5 +1,4 @@ import 'package:collection/collection.dart'; -import 'package:fast_base58/fast_base58.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import "package:photos/extensions/user_extension.dart"; @@ -170,11 +169,8 @@ class _ShareCollectionPageState extends State { ), ); } else { - final String collectionKey = Base58Encode( - CollectionsService.instance.getCollectionKey(widget.collection.id), - ); final String url = - "${widget.collection.publicURLs.first.url}#$collectionKey"; + CollectionsService.instance.getPublicUrl(widget.collection); children.addAll( [ MenuItemWidget( diff --git a/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart index 8afde97947..37b17cefa2 100644 --- a/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart +++ b/mobile/apps/photos/lib/ui/viewer/actions/file_selection_actions_widget.dart @@ -1,7 +1,5 @@ import "dart:async"; -import 'package:fast_base58/fast_base58.dart'; -import "package:flutter/cupertino.dart"; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import "package:local_auth/local_auth.dart"; @@ -851,12 +849,9 @@ class _FileSelectionActionsWidgetState Future _sendLink() async { if (_cachedCollectionForSharedLink != null) { - final String collectionKey = Base58Encode( - CollectionsService.instance - .getCollectionKey(_cachedCollectionForSharedLink!.id), + final String url = CollectionsService.instance.getPublicUrl( + _cachedCollectionForSharedLink!, ); - final String url = - "${_cachedCollectionForSharedLink!.publicURLs.first.url}#$collectionKey"; unawaited(Clipboard.setData(ClipboardData(text: url))); await shareImageAndUrl( placeholderBytes, diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart b/mobile/apps/photos/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart index df90b8a10c..48ef541e87 100644 --- a/mobile/apps/photos/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart +++ b/mobile/apps/photos/lib/ui/viewer/gallery/collect_photos_bottom_buttons.dart @@ -1,4 +1,3 @@ -import "package:fast_base58/fast_base58.dart"; import "package:flutter/material.dart"; import "package:photos/generated/l10n.dart"; import "package:photos/models/collection/collection.dart"; @@ -45,10 +44,7 @@ class _EmptyAlbumStateNewState extends State { } Future _shareAlbumUrl() async { - final String collectionKey = Base58Encode( - CollectionsService.instance.getCollectionKey(widget.c.id), - ); - final String url = "${widget.c.publicURLs.first.url}#$collectionKey"; + final String url = CollectionsService.instance.getPublicUrl(widget.c); await shareAlbumLinkWithPlaceholder( context, widget.c,