From ab17f935c3994a32889384433fdc2872ce84e0c8 Mon Sep 17 00:00:00 2001 From: mimi89999 Date: Wed, 10 Feb 2021 13:53:47 +0100 Subject: [PATCH] Fix formatting of openkeychain_required_long message --- src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 3 ++- src/main/res/values/strings.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 0abb74564..ff193f0c6 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -34,6 +34,7 @@ import android.os.IBinder; import android.os.PowerManager; import android.os.SystemClock; import android.preference.PreferenceManager; +import android.text.Html; import android.text.InputType; import android.util.DisplayMetrics; import android.util.Log; @@ -248,7 +249,7 @@ public abstract class XmppActivity extends ActionBarActivity { Builder builder = new AlertDialog.Builder(this); builder.setTitle(getString(R.string.openkeychain_required)); builder.setIconAttribute(android.R.attr.alertDialogIcon); - builder.setMessage(getString(R.string.openkeychain_required_long, getString(R.string.app_name))); + builder.setMessage(Html.fromHtml(getString(R.string.openkeychain_required_long, getString(R.string.app_name)))); builder.setNegativeButton(getString(R.string.cancel), null); builder.setNeutralButton(getString(R.string.restart), (dialog, which) -> { diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 25de0b2dd..197756c89 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -100,7 +100,7 @@ Send unencrypted Decryption failed. Maybe you don’t have the proper private key. OpenKeychain - %1$s uses OpenKeychain to encrypt and decrypt messages and manage your public keys.\n\nIt is licensed under GPLv3+ and available on F-Droid and Google Play.\n\n(Please restart %1$s afterwards.) + OpenKeychain to encrypt and decrypt messages and manage your public keys.

It is licensed under GPLv3+ and available on F-Droid and Google Play.

(Please restart %1$s afterwards.)]]>
Restart Install Please install OpenKeychain