From 7d6688adff1342c2c7bbde5b3f0ff3d894fa0cf3 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Mon, 25 Nov 2024 18:50:08 +0530 Subject: [PATCH] [mob][photos] Use better names to avoid potential confusion --- mobile/lib/services/collections_service.dart | 20 +++++++++++-------- mobile/lib/ui/tabs/home_widget.dart | 4 ++-- .../viewer/file_details/added_by_widget.dart | 4 ++-- .../component/gallery_file_widget.dart | 4 ++-- .../gallery/gallery_app_bar_widget.dart | 6 +++--- mobile/lib/utils/diff_fetcher.dart | 6 +++--- mobile/lib/utils/file_download_util.dart | 6 +++--- mobile/lib/utils/thumbnail_util.dart | 8 ++++---- 8 files changed, 31 insertions(+), 27 deletions(-) diff --git a/mobile/lib/services/collections_service.dart b/mobile/lib/services/collections_service.dart index 0d1c549971..1be6ba4976 100644 --- a/mobile/lib/services/collections_service.dart +++ b/mobile/lib/services/collections_service.dart @@ -1044,7 +1044,10 @@ class CollectionsService { } } - Future getPublicCollection(BuildContext context, Uri uri) async { + Future getCollectionFromPublicLink( + BuildContext context, + Uri uri, + ) async { final String? authToken = uri.queryParameters["t"]; final String albumKey = uri.fragment; try { @@ -1088,9 +1091,9 @@ class CollectionsService { Future verifyPublicCollectionPassword( BuildContext context, String passwordHash, - int collectioID, + int collectionID, ) async { - final authToken = await getPublicAlbumToken(collectioID); + final authToken = await getSharedPublicAlbumToken(collectionID); try { final response = await _enteDio.post( "https://api.ente.io/public-collection/verify-password", @@ -1104,7 +1107,7 @@ class CollectionsService { ); final jwtToken = response.data["jwtToken"]; if (response.statusCode == 200) { - await setPublicAlbumTokenJWT(collectioID, jwtToken); + await setPublicAlbumTokenJWT(collectionID, jwtToken); return true; } return false; @@ -1119,28 +1122,29 @@ class CollectionsService { } } - Future getPublicAlbumKey(int collectionID) async { + Future getSharedPublicAlbumKey(int collectionID) async { if (_cachedPublicAlbumKey.containsKey(collectionID)) { return _cachedPublicAlbumKey[collectionID]!; } return ""; } - Future getPublicAlbumToken(int collectionID) async { + Future getSharedPublicAlbumToken(int collectionID) async { if (_cachedPublicAlbumToken.containsKey(collectionID)) { return _cachedPublicAlbumToken[collectionID]; } return null; } - Future getPublicAlbumTokenJWT(int collectionID) async { + Future getSharedPublicAlbumTokenJWT(int collectionID) async { if (_cachedPublicAlbumJWT.containsKey(collectionID)) { return _cachedPublicAlbumJWT[collectionID]; } return null; } - bool isPublicCollection(int collectionID) { + /// Is a public link opened in the app + bool isSharedPublicCollection(int collectionID) { return _cachedPublicCollectionID.contains(collectionID); } diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart index 31de34da3c..da488ccf66 100644 --- a/mobile/lib/ui/tabs/home_widget.dart +++ b/mobile/lib/ui/tabs/home_widget.dart @@ -263,8 +263,8 @@ class _HomeWidgetState extends State { Future _handlePublicAlbumLink(Uri uri) async { try { - final Collection collection = - await CollectionsService.instance.getPublicCollection(context, uri); + final Collection collection = await CollectionsService.instance + .getCollectionFromPublicLink(context, uri); if (collection.owner!.id! == Configuration.instance.getUserID()) { await routeToPage( diff --git a/mobile/lib/ui/viewer/file_details/added_by_widget.dart b/mobile/lib/ui/viewer/file_details/added_by_widget.dart index 14090db503..25312347f6 100644 --- a/mobile/lib/ui/viewer/file_details/added_by_widget.dart +++ b/mobile/lib/ui/viewer/file_details/added_by_widget.dart @@ -15,8 +15,8 @@ class AddedByWidget extends StatelessWidget { if (!file.isUploaded) { return const SizedBox.shrink(); } - final bool isPublicFile = - CollectionsService.instance.isPublicCollection(file.collectionID!); + final bool isPublicFile = CollectionsService.instance + .isSharedPublicCollection(file.collectionID!); if (isPublicFile) { return const SizedBox.shrink(); } diff --git a/mobile/lib/ui/viewer/gallery/component/gallery_file_widget.dart b/mobile/lib/ui/viewer/gallery/component/gallery_file_widget.dart index 2b5925c554..baf2b4401e 100644 --- a/mobile/lib/ui/viewer/gallery/component/gallery_file_widget.dart +++ b/mobile/lib/ui/viewer/gallery/component/gallery_file_widget.dart @@ -40,8 +40,8 @@ class GalleryFileWidget extends StatelessWidget { final isFileSelected = selectedFiles?.isFileSelected(file) ?? false; bool isPublicFile = false; if (file.collectionID != null) { - isPublicFile = - CollectionsService.instance.isPublicCollection(file.collectionID!); + isPublicFile = CollectionsService.instance + .isSharedPublicCollection(file.collectionID!); } Color selectionColor = Colors.white; if (isFileSelected && file.isUploaded && file.ownerID != currentUserID) { diff --git a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart index de08d14dfa..00d02027da 100644 --- a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart +++ b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart @@ -848,9 +848,9 @@ class _GalleryAppBarWidgetState extends State { if (galleryType == GalleryType.sharedPublicCollection && collection!.isCollectEnabledForPublicLink()) { final authToken = await CollectionsService.instance - .getPublicAlbumToken(collection.id); - final albumKey = - await CollectionsService.instance.getPublicAlbumKey(authToken!); + .getSharedPublicAlbumToken(collection.id); + final albumKey = await CollectionsService.instance + .getSharedPublicAlbumKey(collection.id); final res = await showChoiceDialog( context, diff --git a/mobile/lib/utils/diff_fetcher.dart b/mobile/lib/utils/diff_fetcher.dart index 1ced5f47da..61e4016280 100644 --- a/mobile/lib/utils/diff_fetcher.dart +++ b/mobile/lib/utils/diff_fetcher.dart @@ -23,10 +23,10 @@ class DiffFetcher { int collectionID, ) async { try { - final authToken = - await CollectionsService.instance.getPublicAlbumToken(collectionID); + final authToken = await CollectionsService.instance + .getSharedPublicAlbumToken(collectionID); final authJWTToken = await CollectionsService.instance - .getPublicAlbumTokenJWT(collectionID); + .getSharedPublicAlbumTokenJWT(collectionID); final headers = { "X-Auth-Access-Token": authToken, diff --git a/mobile/lib/utils/file_download_util.dart b/mobile/lib/utils/file_download_util.dart index 744edf55ce..7af50922a4 100644 --- a/mobile/lib/utils/file_download_util.dart +++ b/mobile/lib/utils/file_download_util.dart @@ -39,7 +39,7 @@ Future downloadAndDecryptPublicFile( try { final authJWTToken = await CollectionsService.instance - .getPublicAlbumTokenJWT(file.collectionID!); + .getSharedPublicAlbumTokenJWT(file.collectionID!); final headers = { "X-Auth-Access-Token": authToken, @@ -98,9 +98,9 @@ Future downloadAndDecrypt( ProgressCallback? progressCallback, }) async { if (await CollectionsService.instance - .isPublicCollection(file.collectionID!)) { + .isSharedPublicCollection(file.collectionID!)) { final authToken = await CollectionsService.instance - .getPublicAlbumToken(file.collectionID!); + .getSharedPublicAlbumToken(file.collectionID!); return await downloadAndDecryptPublicFile( file, diff --git a/mobile/lib/utils/thumbnail_util.dart b/mobile/lib/utils/thumbnail_util.dart index e39246f68c..a1d8ed27a1 100644 --- a/mobile/lib/utils/thumbnail_util.dart +++ b/mobile/lib/utils/thumbnail_util.dart @@ -161,12 +161,12 @@ Future _downloadAndDecryptThumbnail(FileDownloadItem item) async { final file = item.file; Uint8List encryptedThumbnail; try { - if (await CollectionsService.instance - .isPublicCollection(file.collectionID!)) { + if (CollectionsService.instance + .isSharedPublicCollection(file.collectionID!)) { final authToken = await CollectionsService.instance - .getPublicAlbumToken(file.collectionID!); + .getSharedPublicAlbumToken(file.collectionID!); final authJWTToken = await CollectionsService.instance - .getPublicAlbumTokenJWT(file.collectionID!); + .getSharedPublicAlbumTokenJWT(file.collectionID!); final headers = { "X-Auth-Access-Token": authToken,