diff --git a/assets/l10n/intl_en.arb b/assets/l10n/intl_en.arb index 088f7802..7b30bc1c 100644 --- a/assets/l10n/intl_en.arb +++ b/assets/l10n/intl_en.arb @@ -1290,7 +1290,7 @@ "type": "text", "placeholders": {} }, - "noGoogleServicesWarning": "It seems that you have no google services on your phone. That's a good decision for your privacy! To receive push notifications in FluffyChat we recommend using https://microg.org/ or https://unifiedpush.org/.", + "noGoogleServicesWarning": "Firebase Cloud Messaging doesn't appear to be available on your device. To still receive push notifications, we recommend installing MicroG or Unified Push.", "@noGoogleServicesWarning": { "type": "text", "placeholders": {} @@ -2541,5 +2541,7 @@ "banUserDescription": "The user will be banned from the chat and will not be able to enter the chat again until they are unbanned.", "unbanUserDescription": "The user will be able to enter the chat again if they try.", "kickUserDescription": "The user is kicked out of the chat but not banned. In public chats, the user can rejoin at any time.", - "makeAdminDescription": "Once you make this user admin, you may not be able to undo this as they will then have the same permissions as you." + "makeAdminDescription": "Once you make this user admin, you may not be able to undo this as they will then have the same permissions as you.", + "pushNotificationsNotAvailable": "Push notifications not available", + "learnMore": "Learn more" } diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index 1f04d4d6..8853cf62 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -271,7 +271,7 @@ class BackgroundPush { if (matrix == null) { return; } - if (await store.getItemBool(SettingKeys.showNoGoogle, true) == true) { + if (await store.getItemBool(SettingKeys.showNoGoogle, false) == true) { return; } await loadLocale(); diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 2c26de59..90352db0 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -376,14 +376,19 @@ class MatrixState extends State with WidgetsBindingObserver { final result = await showOkCancelAlertDialog( barrierDismissible: true, context: context, - title: L10n.of(context)!.oopsSomethingWentWrong, + title: L10n.of(context)!.pushNotificationsNotAvailable, message: errorMsg, - okLabel: - link == null ? L10n.of(context)!.ok : L10n.of(context)!.help, + fullyCapitalizedForMaterial: false, + okLabel: link == null + ? L10n.of(context)!.ok + : L10n.of(context)!.learnMore, cancelLabel: L10n.of(context)!.doNotShowAgain, ); if (result == OkCancelResult.ok && link != null) { - launchUrlString(link.toString()); + launchUrlString( + link.toString(), + mode: LaunchMode.externalApplication, + ); } if (result == OkCancelResult.cancel) { await store.setItemBool(SettingKeys.showNoGoogle, true);