diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-12-04 13:39:08 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-12-04 13:39:08 +0100 |
| commit | 1e7b4030bba1cd0b6759c6c41a328fc231f3e0cc (patch) | |
| tree | 2ef6d09646c07b3090d2d4f2cef0976d4abb2763 /src/main/java | |
| parent | 1a89915b31162437d61f167959e3db55459c4f5a (diff) | |
show jid monospaced in verify dialog
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java | 1 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java index 91ce34a9..c5fb67cd 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 29739f23..507fc92a 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 |