TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mob][photos] Fix red screen error caused by the dialog asking for permission to allow opening album links in-app

Browse Source
This commit is contained in:
ashilkn
2024-11-21 08:56:29 +05:30
parent 1db6c99b28
commit 6c7d403d5d
2 changed files with 42 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
mobile/lib/services/deeplink_service.dart
View File

@@ -23,41 +23,45 @@ class DeeplinkService {
}
Future<void> requestDeeplinkPermissions(BuildContext context) async {
if (!hasConfiguredDeeplinkPermissions() &&
RemoteSyncService.instance.isFirstRemoteSyncDone()) {
final choice = await showChoiceActionSheet(
isDismissible: false,
context,
title: "",
body: "Allow app to open album links",
firstButtonLabel: "Allow",
);
if (choice!.action == ButtonAction.first) {
if (Platform.isAndroid) {
final AndroidIntent intent;
final PackageInfo packageInfo = await PackageInfo.fromPlatform();
if (packageInfo.packageName == 'io.ente.photos.independent') {
intent = const AndroidIntent(
action: 'android.settings.APP_OPEN_BY_DEFAULT_SETTINGS',
package: 'io.ente.photos.independent',
data: 'package:io.ente.photos.independent',
);
await intent.launch();
} else if (packageInfo.packageName == 'io.ente.photos.fdroid') {
intent = const AndroidIntent(
action: 'android.settings.APP_OPEN_BY_DEFAULT_SETTINGS',
package: 'io.ente.photos.fdroid',
data: 'package:io.ente.photos.fdroid',
);
await intent.launch();
_logger.info("Requesting to allow opening public links in-app");
try {
if (!hasConfiguredDeeplinkPermissions() &&
RemoteSyncService.instance.isFirstRemoteSyncDone()) {
final choice = await showChoiceActionSheet(
isDismissible: false,
context,
title: "",
body: "Allow app to open album links",
firstButtonLabel: "Allow",
);
if (choice!.action == ButtonAction.first) {
if (Platform.isAndroid) {
final AndroidIntent intent;
final PackageInfo packageInfo = await PackageInfo.fromPlatform();
if (packageInfo.packageName == 'io.ente.photos.independent') {
intent = const AndroidIntent(
action: 'android.settings.APP_OPEN_BY_DEFAULT_SETTINGS',
package: 'io.ente.photos.independent',
data: 'package:io.ente.photos.independent',
);
await intent.launch();
} else if (packageInfo.packageName == 'io.ente.photos.fdroid') {
intent = const AndroidIntent(
action: 'android.settings.APP_OPEN_BY_DEFAULT_SETTINGS',
package: 'io.ente.photos.fdroid',
data: 'package:io.ente.photos.fdroid',
);
await intent.launch();
}
await setConfiguredDeeplinkPermissions(true);
_logger.info("Deeplink permissions granted");
}
await setConfiguredDeeplinkPermissions(true);
_logger.info("Deeplink permissions granted");
} else {
_logger.info("Deeplink permissions not granted");
}
} else {
_logger.info("Deeplink permissions not granted");
Navigator.of(context).pop();
}
} catch (e) {
_logger.severe("Failed to req deeplink permission for album links", e);
}
}

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

@@ -236,6 +236,12 @@ class _HomeWidgetState extends State<HomeWidget> {
NotificationService.instance
.initialize(_onDidReceiveNotificationResponse)
.ignore();
Platform.isAndroid
? WidgetsBinding.instance.addPostFrameCallback((_) {
DeeplinkService.instance.requestDeeplinkPermissions(context);
})
: null;
}
Future<void> _handlePublicAlbumLink(Uri uri) async {
@@ -519,7 +525,6 @@ class _HomeWidgetState extends State<HomeWidget> {
if (!LocalSyncService.instance.hasCompletedFirstImport()) {
return const LoadingPhotosWidget();
}
DeeplinkService.instance.requestDeeplinkPermissions(context).ignore();
if (_sharedFiles != null &&
_sharedFiles!.isNotEmpty &&
_shouldRenderCreateCollectionSheet) {