XmppConnection: throw bind failure when server tries to reassign domain

1 files changed, 6 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
index ab1b5ab0c..954ded6b2 100644
--- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java
@@ -1080,7 +1080,12 @@ public class XmppConnection implements Runnable {
                     final Element jid = bind.findChild("jid");
                     if (jid != null && jid.getContent() != null) {
                         try {
-                            if (account.setJid(Jid.fromString(jid.getContent()))) {
+                            Jid assignedJid = Jid.fromString(jid.getContent());
+                            if (!account.getJid().getDomainpart().equals(assignedJid.getDomainpart())) {
+                                Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": server tried to re-assign domain to " + assignedJid.getDomainpart());
+                                throw new StateChangingError(Account.State.BIND_FAILURE);
+                            }
+                            if (account.setJid(assignedJid)) {
                                 Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": bare jid changed during bind. updating database");
                                 mXmppConnectionService.databaseBackend.updateAccount(account);
                             }