Only set "Note to Self" on a *copy*

Stephen Paul Weber created 2 years ago

Change summary

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

Detailed changes

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,

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);
                 }