From 6537387f718cfcb1560ce7f76d55a64f7ee5d7cd Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Tue, 16 Aug 2022 13:35:43 -0500 Subject: [PATCH] Get XMPP URI names from bookmarks as well --- .../java/eu/siacs/conversations/ui/util/MyLinkify.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java b/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java index f48d7536742464d521b07a014422f2d813bcca8f..8ded49f1ddbd9f358cb342d5363bd46c87f96e60 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java @@ -38,7 +38,7 @@ import android.text.util.Linkify; import java.util.Locale; import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.ListItem; import eu.siacs.conversations.entities.Roster; import eu.siacs.conversations.ui.text.FixedURLSpan; import eu.siacs.conversations.utils.GeoHelper; @@ -132,11 +132,13 @@ public class MyLinkify { Uri uri = Uri.parse(urlspan.getURL()); if ("xmpp".equals(uri.getScheme())) { try { - Contact contact = roster.getContact(Jid.of(uri.getSchemeSpecificPart())); + Jid jid = new XmppUri(uri).getJid(); + ListItem item = account.getBookmark(jid); + if (item == null) item = roster.getContact(jid); body.replace( body.getSpanStart(urlspan), body.getSpanEnd(urlspan), - contact.getDisplayName() + item.getDisplayName() ); } catch (final IllegalArgumentException e) { /* bad JID */ } }