mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-29 00:14:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix formatting of openkeychain_required_long message

Browse source 
(cherry picked from commit ab17f935c3)
This commit is contained in:
mimi89999 2021-02-10 13:53:47 +01:00 • committed by Christian Schneppe
parent a9aef40ce5
commit cb721db97e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
View file

@ -37,6 +37,7 @@ import android.os.PowerManager;
import android.os.SystemClock;
import android.preference.PreferenceManager;
import android.provider.Settings;
import android.text.Html;
import android.text.InputType;
import android.util.DisplayMetrics;
import android.util.Log;
@ -283,7 +284,7 @@ public abstract class XmppActivity extends ActionBarActivity {
final AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.openkeychain_required));
builder.setIconAttribute(android.R.attr.alertDialogIcon);
builder.setMessage(getText(R.string.openkeychain_required_long));
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) -> {

2
src/main/res/values/strings.xml
View file

@ -88,7 +88,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">blabber.im utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart blabber.im afterwards.)</small></string>
<string name="openkeychain_required_long">%s utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart %s afterwards.)</small></string>
<string name="restart">Restart</string>
<string name="install">Install</string>
<string name="offering">offering…</string>