From efeb8fccb50412b184d14dfd7b8f71cea8a82077 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 28 Apr 2023 21:14:58 -0500
Subject: [PATCH] Only set "Note to Self" on a *copy*

---
 src/main/java/eu/siacs/conversations/entities/Contact.java   | 5 +++++
 .../eu/siacs/conversations/ui/StartConversationActivity.java | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 57535bf275cd4ae38fb878839cc0de00ec69f5ba..b95245fe1d9df2d9551ad36e80078c464fd0311f 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -83,6 +83,11 @@ public class Contact implements ListItem, Blockable {
     private String mLastPresence = null;
     private RtpCapability.Capability rtpCapability;
 
+    public Contact(Contact other) {
+        this(other.getAccount().getUuid(), other.systemName, other.serverName, other.presenceName, other.jid, other.subscription, other.photoUri, other.systemAccount, other.keys.toString(), other.getAvatar().sha1sum, other.mLastseen, other.mLastPresence, other.groups.toString(), other.rtpCapability);
+        setAccount(other.getAccount());
+    }
+
     public Contact(final String account, final String systemName, final String serverName, final String presenceName,
                    final Jid jid, final int subscription, final String photoUri,
                    final Uri systemAccount, final String keys, final String avatar, final long lastseen,
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 07556b268b7c2515471c98e3402b0f56431e7f51..5a89b2f9b1990053b3b98f34ce7b62e8cc3c487a 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -1178,9 +1178,9 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
                     }
                 }
 
-                final Contact self = account.getSelfContact();
+                final Contact self = new Contact(account.getSelfContact());
+                self.setSystemName("Note to Self");
                 if (self.match(this, needle)) {
-                    self.setSystemName("Note to Self");
                     this.contacts.add(self);
                 }