kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-13 01:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[mob][photos] Use better names to avoid potential confusion

Browse Source
This commit is contained in:
ashilkn
2024-11-25 18:50:08 +05:30
parent e2e2987e6e
commit 7d6688adff
8 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mobile/lib/services/collections_service.dart
View File

@@ -1044,7 +1044,10 @@ class CollectionsService {
} }
} }
Future<Collection> getPublicCollection(BuildContext context, Uri uri) async { Future<Collection> getCollectionFromPublicLink(
BuildContext context,
Uri uri,
) async {
final String? authToken = uri.queryParameters["t"]; final String? authToken = uri.queryParameters["t"];
final String albumKey = uri.fragment; final String albumKey = uri.fragment;
try { try {
@@ -1088,9 +1091,9 @@ class CollectionsService {
Future<bool> verifyPublicCollectionPassword( Future<bool> verifyPublicCollectionPassword(
BuildContext context, BuildContext context,
String passwordHash, String passwordHash,
int collectioID, int collectionID,
) async { ) async {
final authToken = await getPublicAlbumToken(collectioID); final authToken = await getSharedPublicAlbumToken(collectionID);
try { try {
final response = await _enteDio.post( final response = await _enteDio.post(
"https://api.ente.io/public-collection/verify-password", "https://api.ente.io/public-collection/verify-password",
@@ -1104,7 +1107,7 @@ class CollectionsService {
); );
final jwtToken = response.data["jwtToken"]; final jwtToken = response.data["jwtToken"];
if (response.statusCode == 200) { if (response.statusCode == 200) {
await setPublicAlbumTokenJWT(collectioID, jwtToken); await setPublicAlbumTokenJWT(collectionID, jwtToken);
return true; return true;
} }
return false; return false;
@@ -1119,28 +1122,29 @@ class CollectionsService {
} }
} }
Future<String> getPublicAlbumKey(int collectionID) async { Future<String> getSharedPublicAlbumKey(int collectionID) async {
if (_cachedPublicAlbumKey.containsKey(collectionID)) { if (_cachedPublicAlbumKey.containsKey(collectionID)) {
return _cachedPublicAlbumKey[collectionID]!; return _cachedPublicAlbumKey[collectionID]!;
} }
return ""; return "";
} }
Future<String?> getPublicAlbumToken(int collectionID) async { Future<String?> getSharedPublicAlbumToken(int collectionID) async {
if (_cachedPublicAlbumToken.containsKey(collectionID)) { if (_cachedPublicAlbumToken.containsKey(collectionID)) {
return _cachedPublicAlbumToken[collectionID]; return _cachedPublicAlbumToken[collectionID];
} }
return null; return null;
} }
Future<String?> getPublicAlbumTokenJWT(int collectionID) async { Future<String?> getSharedPublicAlbumTokenJWT(int collectionID) async {
if (_cachedPublicAlbumJWT.containsKey(collectionID)) { if (_cachedPublicAlbumJWT.containsKey(collectionID)) {
return _cachedPublicAlbumJWT[collectionID]; return _cachedPublicAlbumJWT[collectionID];
} }
return null; return null;
} }
bool isPublicCollection(int collectionID) { /// Is a public link opened in the app
bool isSharedPublicCollection(int collectionID) {
return _cachedPublicCollectionID.contains(collectionID); return _cachedPublicCollectionID.contains(collectionID);
} }

4
mobile/lib/ui/tabs/home_widget.dart
View File

@@ -263,8 +263,8 @@ class _HomeWidgetState extends State<HomeWidget> {
Future<void> _handlePublicAlbumLink(Uri uri) async { Future<void> _handlePublicAlbumLink(Uri uri) async {
try { try {
final Collection collection = final Collection collection = await CollectionsService.instance
await CollectionsService.instance.getPublicCollection(context, uri); .getCollectionFromPublicLink(context, uri);
if (collection.owner!.id! == Configuration.instance.getUserID()) { if (collection.owner!.id! == Configuration.instance.getUserID()) {
await routeToPage( await routeToPage(

4
mobile/lib/ui/viewer/file_details/added_by_widget.dart
View File

@@ -15,8 +15,8 @@ class AddedByWidget extends StatelessWidget {
if (!file.isUploaded) { if (!file.isUploaded) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
final bool isPublicFile = final bool isPublicFile = CollectionsService.instance
CollectionsService.instance.isPublicCollection(file.collectionID!); .isSharedPublicCollection(file.collectionID!);
if (isPublicFile) { if (isPublicFile) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }

4
mobile/lib/ui/viewer/gallery/component/gallery_file_widget.dart
View File

@@ -40,8 +40,8 @@ class GalleryFileWidget extends StatelessWidget {
final isFileSelected = selectedFiles?.isFileSelected(file) ?? false; final isFileSelected = selectedFiles?.isFileSelected(file) ?? false;
bool isPublicFile = false; bool isPublicFile = false;
if (file.collectionID != null) { if (file.collectionID != null) {
isPublicFile = isPublicFile = CollectionsService.instance
CollectionsService.instance.isPublicCollection(file.collectionID!); .isSharedPublicCollection(file.collectionID!);
} }
Color selectionColor = Colors.white; Color selectionColor = Colors.white;
if (isFileSelected && file.isUploaded && file.ownerID != currentUserID) { if (isFileSelected && file.isUploaded && file.ownerID != currentUserID) {

6
mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart
View File

@@ -848,9 +848,9 @@ class _GalleryAppBarWidgetState extends State<GalleryAppBarWidget> {
if (galleryType == GalleryType.sharedPublicCollection && if (galleryType == GalleryType.sharedPublicCollection &&
collection!.isCollectEnabledForPublicLink()) { collection!.isCollectEnabledForPublicLink()) {
final authToken = await CollectionsService.instance final authToken = await CollectionsService.instance
.getPublicAlbumToken(collection.id); .getSharedPublicAlbumToken(collection.id);
final albumKey = final albumKey = await CollectionsService.instance
await CollectionsService.instance.getPublicAlbumKey(authToken!); .getSharedPublicAlbumKey(collection.id);
final res = await showChoiceDialog( final res = await showChoiceDialog(
context, context,

6
mobile/lib/utils/diff_fetcher.dart
View File

@@ -23,10 +23,10 @@ class DiffFetcher {
int collectionID, int collectionID,
) async { ) async {
try { try {
final authToken = final authToken = await CollectionsService.instance
await CollectionsService.instance.getPublicAlbumToken(collectionID); .getSharedPublicAlbumToken(collectionID);
final authJWTToken = await CollectionsService.instance final authJWTToken = await CollectionsService.instance
.getPublicAlbumTokenJWT(collectionID); .getSharedPublicAlbumTokenJWT(collectionID);
final headers = { final headers = {
"X-Auth-Access-Token": authToken, "X-Auth-Access-Token": authToken,

6
mobile/lib/utils/file_download_util.dart
View File

@@ -39,7 +39,7 @@ Future<File?> downloadAndDecryptPublicFile(
try { try {
final authJWTToken = await CollectionsService.instance final authJWTToken = await CollectionsService.instance
.getPublicAlbumTokenJWT(file.collectionID!); .getSharedPublicAlbumTokenJWT(file.collectionID!);
final headers = { final headers = {
"X-Auth-Access-Token": authToken, "X-Auth-Access-Token": authToken,
@@ -98,9 +98,9 @@ Future<File?> downloadAndDecrypt(
ProgressCallback? progressCallback, ProgressCallback? progressCallback,
}) async { }) async {
if (await CollectionsService.instance if (await CollectionsService.instance
.isPublicCollection(file.collectionID!)) { .isSharedPublicCollection(file.collectionID!)) {
final authToken = await CollectionsService.instance final authToken = await CollectionsService.instance
.getPublicAlbumToken(file.collectionID!); .getSharedPublicAlbumToken(file.collectionID!);
return await downloadAndDecryptPublicFile( return await downloadAndDecryptPublicFile(
file, file,

8
mobile/lib/utils/thumbnail_util.dart
View File

@@ -161,12 +161,12 @@ Future<void> _downloadAndDecryptThumbnail(FileDownloadItem item) async {
final file = item.file; final file = item.file;
Uint8List encryptedThumbnail; Uint8List encryptedThumbnail;
try { try {
if (await CollectionsService.instance if (CollectionsService.instance
.isPublicCollection(file.collectionID!)) { .isSharedPublicCollection(file.collectionID!)) {
final authToken = await CollectionsService.instance final authToken = await CollectionsService.instance
.getPublicAlbumToken(file.collectionID!); .getSharedPublicAlbumToken(file.collectionID!);
final authJWTToken = await CollectionsService.instance final authJWTToken = await CollectionsService.instance
.getPublicAlbumTokenJWT(file.collectionID!); .getSharedPublicAlbumTokenJWT(file.collectionID!);
final headers = { final headers = {
"X-Auth-Access-Token": authToken, "X-Auth-Access-Token": authToken,