From 1e7b4030bba1cd0b6759c6c41a328fc231f3e0cc Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 4 Dec 2016 13:39:08 +0100 Subject: [PATCH] show jid monospaced in verify dialog --- .../eu/siacs/conversations/ui/BlockContactDialog.java | 1 - .../conversations/ui/StartConversationActivity.java | 11 ++++++++++- src/main/res/values/strings.xml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java index 91ce34a93..c5fb67cd7 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java @@ -37,7 +37,6 @@ public final class BlockContactDialog { builder.setTitle(isBlocked ? R.string.action_unblock_domain : R.string.action_block_domain); value = blockable.getJid().toDomainJid().toString(); spannable = new SpannableString(context.getString(isBlocked ? R.string.unblock_domain_text : R.string.block_domain_text, value)); - message.setText(spannable); } else { builder.setTitle(isBlocked ? R.string.action_unblock_contact : R.string.action_block_contact); value = blockable.getJid().toBareJid().toString(); diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 29739f239..507fc92a0 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -28,7 +28,10 @@ import android.os.Parcelable; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.text.Editable; +import android.text.SpannableString; +import android.text.Spanned; import android.text.TextWatcher; +import android.text.style.TypefaceSpan; import android.util.Pair; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; @@ -893,7 +896,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU View view = getLayoutInflater().inflate(R.layout.dialog_verify_fingerprints, null); final CheckBox isTrustedSource = (CheckBox) view.findViewById(R.id.trusted_source); TextView warning = (TextView) view.findViewById(R.id.warning); - warning.setText(getString(R.string.verifying_omemo_keys_trusted_source,contact.getJid().toBareJid().toString(),contact.getDisplayName())); + String jid = contact.getJid().toBareJid().toString(); + SpannableString spannable = new SpannableString(getString(R.string.verifying_omemo_keys_trusted_source,jid,contact.getDisplayName())); + int start = spannable.toString().indexOf(jid); + if (start >= 0) { + spannable.setSpan(new TypefaceSpan("monospace"),start,start + jid.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + } + warning.setText(spannable); builder.setView(view); builder.setPositiveButton(R.string.confirm, new OnClickListener() { @Override diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 51a7a3dc5..6f27a8b16 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -721,6 +721,6 @@ Clean private storage Clean private storage where files are kept (They can be re-downloaded from the server) I followed this link from a trusted source - You are about to verify the OMEMO keys form %1$s after clicking a link. This is only secure if you followed this link from a trusted source where only %2$s could have published this link. + You are about to verify the OMEMO keys of %1$s after clicking a link. This is only secure if you followed this link from a trusted source where only %2$s could have published this link. Verify OMEMO keys