diff options
Diffstat (limited to '')
3 files changed, 12 insertions, 15 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java index 18a3e8adc..984a9c58a 100644 --- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java @@ -44,6 +44,7 @@ import de.pixart.messenger.entities.ListItem; import de.pixart.messenger.services.XmppConnectionService.OnAccountUpdate; import de.pixart.messenger.services.XmppConnectionService.OnRosterUpdate; import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.IrregularUnicodeBlockDetector; import de.pixart.messenger.utils.Namespace; import de.pixart.messenger.utils.TimeframeUtils; import de.pixart.messenger.utils.UIHelper; @@ -140,8 +141,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp AlertDialog.Builder builder = new AlertDialog.Builder( ContactDetailsActivity.this); builder.setTitle(getString(R.string.action_add_phone_book)); - builder.setMessage(getString(R.string.add_phone_book_text, - contact.getDisplayJid())); + builder.setMessage(getString(R.string.add_phone_book_text, contact.getJid().toString())); builder.setNegativeButton(getString(R.string.cancel), null); builder.setPositiveButton(getString(R.string.add), addToPhonebook); builder.create().show(); @@ -392,7 +392,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp if (contact.getServer().toString().toLowerCase().equals(accountJid.getDomain().toLowerCase())) { binding.contactDisplayName.setText(contact.getDisplayName()); } else { - binding.contactDisplayName.setText(contact.getDisplayJid()); + binding.contactDisplayName.setText(contact.getJid().toString()); } if (contact.showInRoster()) { binding.detailsSendPresence.setVisibility(View.VISIBLE); @@ -411,7 +411,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp deleteFromRosterDialog.setTitle(getString(R.string.action_delete_contact)) .setMessage( getString(R.string.remove_contact_text, - contact.getDisplayJid())) + contact.getJid().toString())) .setPositiveButton(getString(R.string.delete), removeFromRoster).create().show(); } @@ -509,12 +509,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp } } - if (contact.getPresences().size() > 1) { - binding.detailsContactjid.setText(contact.getDisplayJid() + " (" - + contact.getPresences().size() + ")"); - } else { - binding.detailsContactjid.setText(contact.getDisplayJid()); - } + binding.detailsContactjid.setText(IrregularUnicodeBlockDetector.style(this, contact.getJid())); String account; if (Config.DOMAIN_LOCK != null) { account = contact.getAccount().getJid().getLocal(); diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java index 3f97b12f9..d401a3c39 100644 --- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java +++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java @@ -31,6 +31,7 @@ import de.pixart.messenger.databinding.KeysCardBinding; import de.pixart.messenger.entities.Account; import de.pixart.messenger.entities.Conversation; import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.IrregularUnicodeBlockDetector; import de.pixart.messenger.utils.XmppUri; import de.pixart.messenger.xmpp.OnKeyStatusUpdated; import rocks.xmpp.addr.Jid; @@ -189,9 +190,8 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat for (Map.Entry<Jid, Map<String, Boolean>> entry : foreignKeysToTrust.entrySet()) { hasForeignKeys = true; KeysCardBinding keysCardBinding = DataBindingUtil.inflate(getLayoutInflater(),R.layout.keys_card, binding.foreignKeys,false); - //final LinearLayout layout = (LinearLayout) getLayoutInflater().inflate(R.layout.keys_card, foreignKeys, false); final Jid jid = entry.getKey(); - keysCardBinding.foreignKeysTitle.setText(jid.toString()); + keysCardBinding.foreignKeysTitle.setText(IrregularUnicodeBlockDetector.style(this, jid)); keysCardBinding.foreignKeysTitle.setOnClickListener(v -> switchToContactDetails(mAccount.getRoster().getContact(jid))); final Map<String, Boolean> fingerprints = entry.getValue(); for (final String fingerprint : fingerprints.keySet()) { @@ -391,7 +391,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat fingerprint, FingerprintStatus.createActive(ownKeysToTrust.get(fingerprint))); } - List<Jid> acceptedTargets = mConversation == null ? new ArrayList<Jid>() : mConversation.getAcceptedCryptoTargets(); + List<Jid> acceptedTargets = mConversation == null ? new ArrayList<>() : mConversation.getAcceptedCryptoTargets(); synchronized (this.foreignKeysToTrust) { for (Map.Entry<Jid, Map<String, Boolean>> entry : foreignKeysToTrust.entrySet()) { Jid jid = entry.getKey(); diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java index f25e6e51d..821483f33 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java @@ -27,7 +27,9 @@ import de.pixart.messenger.databinding.ContactBinding; import de.pixart.messenger.entities.ListItem; import de.pixart.messenger.ui.SettingsActivity; import de.pixart.messenger.ui.XmppActivity; +import de.pixart.messenger.utils.IrregularUnicodeBlockDetector; import de.pixart.messenger.utils.UIHelper; +import rocks.xmpp.addr.Jid; public class ListItemAdapter extends ArrayAdapter<ListItem> { @@ -87,10 +89,10 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> { viewHolder.tags.addView(tv); } } - final String jid = item.getDisplayJid(); + final Jid jid = item.getJid(); if (jid != null) { viewHolder.jid.setVisibility(View.VISIBLE); - viewHolder.jid.setText(jid); + viewHolder.jid.setText(IrregularUnicodeBlockDetector.style(activity, jid)); } else { viewHolder.jid.setVisibility(View.GONE); } |