From ed7388db6d6a7e2660a118931a09754b786c005a Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Mon, 8 May 2023 12:42:25 -0500
Subject: [PATCH] Use bookmark name for a contact when there is no roster item
 but is a bookmark

Especially useful since shortcut code assumes contact right now.
---
 src/main/java/eu/siacs/conversations/entities/Contact.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 14cf8c13c0a4a46062306b4907a898b6cc11575b..e302fed7d342f960c4a4632f5bbbf082bd5ac2a7 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -170,6 +170,11 @@ public class Contact implements ListItem, Blockable {
             return this.systemName;
         } else if (!TextUtils.isEmpty(this.serverName)) {
             return this.serverName;
+        }
+
+        ListItem bookmark = account.getBookmark(jid);
+        if (bookmark != null) {
+            return bookmark.getDisplayName();
         } else if (!TextUtils.isEmpty(this.presenceName) && ((QuickConversationsService.isQuicksy() && JidHelper.isQuicksyDomain(jid.getDomain())) || mutualPresenceSubscription())) {
             return this.presenceName;
         } else if (jid.getLocal() != null) {