create a new axolotl service when the account jid changes

2 files changed, 23 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
index 0aa797aff..87d37788c 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java
@@ -263,6 +263,9 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
     }
 
     public AxolotlService(Account account, XmppConnectionService connectionService) {
+        if (account == null || connectionService == null) {
+            throw new IllegalArgumentException("account and service cannot be null");
+        }
         if (Security.getProvider("BC") == null) {
             Security.addProvider(new BouncyCastleProvider());
         }
@@ -360,6 +363,16 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
         publishBundlesIfNeeded(true, wipeOther);
     }
 
+    public void destroy() {
+        Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": destroying old axolotl service. no longer in use");
+        mXmppConnectionService.databaseBackend.wipeAxolotlDb(account);
+    }
+
+    public AxolotlService makeNew() {
+        Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": make new axolotl service");
+        return new AxolotlService(this.account, this.mXmppConnectionService);
+    }
+
     public int getOwnDeviceId() {
         return axolotlStore.getLocalRegistrationId();
     }
diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java
index 03673c689..3cb5e027f 100644
--- a/src/main/java/de/pixart/messenger/entities/Account.java
+++ b/src/main/java/de/pixart/messenger/entities/Account.java
@@ -314,9 +314,17 @@ public class Account extends AbstractEntity {
 
     public boolean setJid(final Jid next) {
         final Jid prev = this.jid != null ? this.jid.toBareJid() : null;
+        final boolean changed = prev == null || (next != null && !prev.equals(next.toBareJid()));
+        if (changed) {
+            final AxolotlService oldAxolotlService = this.axolotlService;
+            if (oldAxolotlService != null) {
+                oldAxolotlService.destroy();
+                this.jid = next;
+                this.axolotlService = oldAxolotlService.makeNew();
+            }
+        }
         this.jid = next;
-        return prev == null || (next != null && !prev.equals(next.toBareJid())
-        );
+        return changed;
     }
 
     public Jid getServer() {