store jid if it was changed during bind

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java
index bd5555201..7a825faab 100644
--- a/src/main/java/de/pixart/messenger/entities/Account.java
+++ b/src/main/java/de/pixart/messenger/entities/Account.java
@@ -276,9 +276,12 @@ public class Account extends AbstractEntity {
 		return jid.getLocalpart();
 	}
 
-	public void setJid(final Jid jid) {
-		this.jid = jid;
-	}
+    public boolean setJid(final Jid next) {
+        final Jid prev = this.jid != null ? this.jid.toBareJid() : null;
+        this.jid = next;
+        return prev == null || (next != null && !prev.equals(next.toBareJid())
+        );
+    }
 
 	public Jid getServer() {
 		return jid.toDomainJid();