From cec3131a2e6cae54fba50cc22caeca60f31dd2a2 Mon Sep 17 00:00:00 2001 From: ashilkn Date: Tue, 26 Nov 2024 18:03:31 +0530 Subject: [PATCH] Revert "[mob][photos] Open albums.ente.io links and not albums.ente.sh" This reverts commit 4532b4ea8fe6e83fb9f17651725da58c22860919. --- mobile/android/app/src/main/AndroidManifest.xml | 2 +- mobile/ios/Runner/Info.plist | 2 +- mobile/ios/Runner/Runner.entitlements | 2 +- mobile/lib/ui/tabs/home_widget.dart | 8 ++++---- mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart | 6 ++---- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/mobile/android/app/src/main/AndroidManifest.xml b/mobile/android/app/src/main/AndroidManifest.xml index 808229a141..0117b19f95 100644 --- a/mobile/android/app/src/main/AndroidManifest.xml +++ b/mobile/android/app/src/main/AndroidManifest.xml @@ -53,7 +53,7 @@ + android:host="albums.ente.sh"/> diff --git a/mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plist index 0956f839c7..a71a377eaf 100644 --- a/mobile/ios/Runner/Info.plist +++ b/mobile/ios/Runner/Info.plist @@ -50,7 +50,7 @@ CFBundleURLName - albums.ente.io + albums.ente.sh CFBundleURLSchemes https diff --git a/mobile/ios/Runner/Runner.entitlements b/mobile/ios/Runner/Runner.entitlements index 970467a5bb..77b83d3b8c 100644 --- a/mobile/ios/Runner/Runner.entitlements +++ b/mobile/ios/Runner/Runner.entitlements @@ -7,7 +7,7 @@ com.apple.developer.associated-domains webcredentials:web.ente.io - applinks:albums.ente.io + applinks:albums.ente.sh com.apple.security.application-groups diff --git a/mobile/lib/ui/tabs/home_widget.dart b/mobile/lib/ui/tabs/home_widget.dart index 12fa0328aa..18d45818d0 100644 --- a/mobile/lib/ui/tabs/home_widget.dart +++ b/mobile/lib/ui/tabs/home_widget.dart @@ -412,7 +412,7 @@ class _HomeWidgetState extends State { _intentDataStreamSubscription = ReceiveSharingIntent.instance.getMediaStream().listen( (List value) { - if (value[0].path.contains("albums.ente.io")) { + if (value[0].path.contains("albums.ente.sh")) { final uri = Uri.parse(value[0].path); _handlePublicAlbumLink(uri); return; @@ -475,7 +475,7 @@ class _HomeWidgetState extends State { .getInitialMedia() .then((List value) { if (mounted) { - if (value[0].path.contains("albums.ente.io")) { + if (value[0].path.contains("albums.ente.sh")) { final uri = Uri.parse(value[0].path); _handlePublicAlbumLink(uri); return; @@ -508,7 +508,7 @@ class _HomeWidgetState extends State { try { final initialUri = await getInitialUri(); if (initialUri != null) { - if (initialUri.toString().contains("albums.ente.io")) { + if (initialUri.toString().contains("albums.ente.sh")) { await _handlePublicAlbumLink(initialUri); } else { _logger.info( @@ -527,7 +527,7 @@ class _HomeWidgetState extends State { _publicAlbumLinkSubscription = uriLinkStream.listen( (Uri? uri) { if (uri != null) { - if (uri.toString().contains("albums.ente.io")) { + if (uri.toString().contains("albums.ente.sh")) { _handlePublicAlbumLink(uri); } else { _logger.info( 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 6e77ebe26f..2eb32bda82 100644 --- a/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart +++ b/mobile/lib/ui/viewer/gallery/gallery_app_bar_widget.dart @@ -203,9 +203,7 @@ class _GalleryAppBarWidgetState extends State { galleryType != GalleryType.quickLink) { showToast( context, - S - .of(context) - .typeOfGallerGallerytypeIsNotSupportedForRename("$galleryType"), + S.of(context).typeOfGallerGallerytypeIsNotSupportedForRename("$galleryType"), ); return; @@ -866,7 +864,7 @@ class _GalleryAppBarWidgetState extends State { MaterialPageRoute( builder: (context) => WebPage( widget.title ?? "", - "https://albums.ente.io/?t=$authToken#$albumKey", + "https://albums.ente.sh/?t=$authToken#$albumKey", ), ), );