From 9c06087f682fb2d320b40d5d3a3e3424bb15acae Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 15 Mar 2023 21:47:08 -0500 Subject: [PATCH] Add Note to Self contact --- src/main/java/eu/siacs/conversations/entities/Contact.java | 2 +- .../siacs/conversations/ui/StartConversationActivity.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index 06e43cef4..a39b7801b 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -151,7 +151,7 @@ public class Contact implements ListItem, Blockable { } public String getDisplayName() { - if (isSelf()) { + if (isSelf() && TextUtils.isEmpty(this.systemName)) { final String displayName = account.getDisplayName(); if (!Strings.isNullOrEmpty(displayName)) { return displayName; diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 13db804ec..4e619c9d3 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -1080,6 +1080,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne } } + final Contact self = account.getSelfContact(); + if (self.match(this, needle)) { + self.setSystemName("Note to Self"); + this.contacts.add(self); + } + for (Bookmark bookmark : account.getBookmarks()) { if (bookmark.match(this, needle)) { if (bookmark.getJid().toString().equals("discuss@conference.soprani.ca")) { -- 2.38.4