diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
index 3a6b0e8ad..2c1555d0a 100644
--- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
@@ -162,13 +162,13 @@ public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
View gl = View.inflate(getActivity(), R.layout.autodel_confirm, null);
CheckBox confirmCheckbox = gl.findViewById(R.id.i_understand);
- String msg = context.getString(fromServer?
- R.string.autodel_server_ask : R.string.autodel_device_ask,
- delCount, ""+getSelectedSummary(preference, newValue)+"");
+ String html = String.format(Html.escapeHtml(context.getString(fromServer?
+ R.string.autodel_server_ask : R.string.autodel_device_ask)),
+ delCount, ""+Html.escapeHtml(getSelectedSummary(preference, newValue))+"");
new AlertDialog.Builder(context)
.setTitle(preference.getTitle())
- .setMessage(Html.fromHtml(msg.replace("\n", "
")))
+ .setMessage(Html.fromHtml(html.replace("\n", "
")))
.setView(gl)
.setPositiveButton(android.R.string.ok, (dialog, whichButton) -> {
if (confirmCheckbox.isChecked()) {
diff --git a/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java b/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java
index c8987af07..37d63ae6a 100644
--- a/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java
+++ b/src/org/thoughtcrime/securesms/qr/QrCodeHandler.java
@@ -86,18 +86,18 @@ public class QrCodeHandler implements DcEventCenter.DcEventDelegate {
switch (qrParsed.getState()) {
case DcContext.DC_QR_ERROR:
scannedText = qrRawString;
- msg = qrParsed.getText1() + "
" + String.format(activity.getString(R.string.qrscan_contains_text), scannedText) + "";
+ msg = qrParsed.getText1() + "\n\n" + activity.getString(R.string.qrscan_contains_text, scannedText);
break;
case DcContext.DC_QR_TEXT:
scannedText = qrParsed.getText1();
- msg = String.format(activity.getString(R.string.qrscan_contains_text), scannedText);
+ msg = activity.getString(R.string.qrscan_contains_text, scannedText);
break;
default:
scannedText = qrRawString;
- msg = String.format(activity.getString(R.string.qrscan_contains_text), scannedText);
+ msg = activity.getString(R.string.qrscan_contains_text, scannedText);
break;
}
- builder.setMessage(Html.fromHtml(msg));
+ builder.setMessage(msg);
builder.setPositiveButton(android.R.string.ok, null);
builder.setNeutralButton(R.string.menu_copy_to_clipboard, (dialog, which) -> {
Util.writeTextToClipboard(activity, scannedText);
@@ -123,7 +123,7 @@ public class QrCodeHandler implements DcEventCenter.DcEventDelegate {
private void showFingerprintOrQrSuccess(AlertDialog.Builder builder, DcLot qrParsed, String nameAndAddress) {
@StringRes int resId = qrParsed.getState() == DcContext.DC_QR_ADDR ? R.string.ask_start_chat_with : R.string.qrshow_x_verified;
- builder.setMessage(Html.fromHtml(String.format(activity.getString(resId, nameAndAddress))));
+ builder.setMessage(activity.getString(resId, nameAndAddress));
builder.setPositiveButton(R.string.start_chat, (dialogInterface, i) -> {
int chatId = dcContext.createChatByContactId(qrParsed.getId());
Intent intent = new Intent(activity, ConversationActivity.class);
@@ -134,12 +134,12 @@ public class QrCodeHandler implements DcEventCenter.DcEventDelegate {
}
private void showFingerPrintError(AlertDialog.Builder builder, String nameAndAddress) {
- builder.setMessage(Html.fromHtml(String.format(activity.getString(R.string.qrscan_fingerprint_mismatch), nameAndAddress)));
+ builder.setMessage(activity.getString(R.string.qrscan_fingerprint_mismatch, nameAndAddress));
builder.setPositiveButton(android.R.string.ok, null);
}
private void showVerifyFingerprintWithoutAddress(AlertDialog.Builder builder, DcLot qrParsed) {
- builder.setMessage(Html.fromHtml(activity.getString(R.string.qrscan_no_addr_found) + "
" + activity.getString(R.string.qrscan_fingerprint_label) + ":
" + qrParsed.getText1() + ""));
+ builder.setMessage(activity.getString(R.string.qrscan_no_addr_found) + "\n\n" + activity.getString(R.string.qrscan_fingerprint_label) + ":\n" + qrParsed.getText1());
builder.setPositiveButton(android.R.string.ok, null);
builder.setNeutralButton(R.string.menu_copy_to_clipboard, (dialog, which) -> {
Util.writeTextToClipboard(activity, qrParsed.getText1());
@@ -156,13 +156,13 @@ public class QrCodeHandler implements DcEventCenter.DcEventDelegate {
String msg;
switch (qrParsed.getState()) {
case DcContext.DC_QR_ASK_VERIFYGROUP:
- msg = String.format(activity.getString(R.string.qrscan_ask_join_group), qrParsed.getText1());
+ msg = activity.getString(R.string.qrscan_ask_join_group, qrParsed.getText1());
break;
default:
- msg = String.format(activity.getString(R.string.ask_start_chat_with), nameNAddr);
+ msg = activity.getString(R.string.ask_start_chat_with, nameNAddr);
break;
}
- builder.setMessage(Html.fromHtml(msg));
+ builder.setMessage(msg);
builder.setPositiveButton(android.R.string.ok, (dialogInterface, i) -> {
progressDialog = new ProgressDialog(activity);
progressDialog.setMessage(activity.getString(R.string.one_moment));
diff --git a/src/org/thoughtcrime/securesms/qr/QrShowFragment.java b/src/org/thoughtcrime/securesms/qr/QrShowFragment.java
index f2caec2e5..24a68998a 100644
--- a/src/org/thoughtcrime/securesms/qr/QrShowFragment.java
+++ b/src/org/thoughtcrime/securesms/qr/QrShowFragment.java
@@ -122,9 +122,9 @@ public class QrShowFragment extends Fragment implements DcEventCenter.DcEventDel
private void setHintText() {
if (!dcContext.isNetworkConnected()) {
- hintBelowQr.setText(Html.fromHtml(errorHint));
+ hintBelowQr.setText(errorHint);
} else {
- hintBelowQr.setText(Html.fromHtml(hint));
+ hintBelowQr.setText(hint);
}
}