diff options
| author | mimi89999 <michel@lebihan.pl> | 2021-02-10 15:53:47 +0300 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2021-02-10 16:16:56 +0300 |
| commit | ab17f935c3994a32889384433fdc2872ce84e0c8 (patch) | |
| tree | f0c02cd147e0aa2179d569140a3ae9c755b65096 | |
| parent | d51b4380d7a6bdfbb0b13ede9d09466995d3b4f6 (diff) | |
Fix formatting of openkeychain_required_long message
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 3 | ||||
| -rw-r--r-- | 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 @@ <string name="send_unencrypted">Send unencrypted</string> <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string> <string name="openkeychain_required">OpenKeychain</string> - <string name="openkeychain_required_long">%1$s uses <b>OpenKeychain</b> 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<small>(Please restart %1$s afterwards.)</small></string> + <string name="openkeychain_required_long"><![CDATA[%1$s uses <b>OpenKeychain</b> to encrypt and decrypt messages and manage your public keys.<br><br>It is licensed under GPLv3+ and available on F-Droid and Google Play.<br><br><small>(Please restart %1$s afterwards.)</small>]]></string> <string name="restart">Restart</string> <string name="install">Install</string> <string name="openkeychain_not_installed">Please install OpenKeychain</string> |