fix some crashes

1 files changed, 7 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java
index 71e20676e..f7a9c0a6f 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java
@@ -115,7 +115,13 @@ public class XmppAxolotlSession implements Comparable<XmppAxolotlSession> {
                         SignalMessage signalMessage = new SignalMessage(encryptedKey.key);
                         try {
                             plaintext = cipher.decrypt(signalMessage);
-                        } catch (InvalidMessageException | NoSessionException e) {
+                        } catch (InvalidMessageException e) {
+                            if (iterator.hasNext()) {
+                                Log.w(Config.LOGTAG, account.getJid().asBareJid() + ": ignoring crypto exception because possible keys left to try", e);
+                                continue;
+                            }
+                            throw new BrokenSessionException(this.remoteAddress, e);
+                        } catch (NoSessionException e) {
                             if (iterator.hasNext()) {
                                 Log.w(Config.LOGTAG, account.getJid().asBareJid() + ": ignoring crypto exception because possible keys left to try", e);
                                 continue;