Merge pull request #1581 from ManfredKarrer/protobuffer-exception-han…

…dling Handle unknown PB data from encrypted messages
bisq-network · Jun 22, 2018 · 0cc4f7b · 0cc4f7b
2 parents 511458b + 68c4089
commit 0cc4f7b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/bisq/desktop/main/MainViewModel.java b/src/main/java/bisq/desktop/main/MainViewModel.java
@@ -88,6 +88,7 @@
 import bisq.common.crypto.CryptoException;
 import bisq.common.crypto.KeyRing;
 import bisq.common.crypto.SealedAndSigned;
+import bisq.common.proto.ProtobufferException;
 import bisq.common.storage.CorruptedDatabaseFilesHandler;
 
 import org.bitcoinj.core.Address;
@@ -807,7 +808,7 @@ public void run() {
                     } else {
                         throw new CryptoException("Payload not correct after decryption");
                     }
-                } catch (CryptoException e) {
+                } catch (CryptoException | ProtobufferException e) {
                     e.printStackTrace();
                     String msg = Res.get("popup.warning.cryptoTestFailed", e.getMessage());
                     log.error(msg);