From 6e9fb17f8f439361a0d60de57c5cd3477b027498 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Wed, 20 Jun 2018 11:51:46 +0200
Subject: [PATCH] Make CorruptedOmemoKeyException not swallow exceptions

---
 .../smackx/omemo/signal/SignalOmemoKeyUtil.java           | 8 ++++----
 .../smackx/omemo/signal/SignalOmemoService.java           | 2 +-
 .../omemo/exceptions/CorruptedOmemoKeyException.java      | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
index 34568b47a..010eb65ed 100644
--- a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
+++ b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
@@ -70,7 +70,7 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
         try {
             return KeyHelper.generateSignedPreKey(identityKeyPair, currentPreKeyId);
         } catch (InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         }
     }
 
@@ -102,7 +102,7 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
         try {
             return new IdentityKeyPair(data);
         } catch (InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         }
     }
 
@@ -112,7 +112,7 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
         try {
             return new IdentityKey(data, 0);
         } catch (InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         }
     }
 
@@ -122,7 +122,7 @@ public class SignalOmemoKeyUtil extends OmemoKeyUtil<IdentityKeyPair, IdentityKe
         try {
             return Curve.decodePoint(data, 0);
         } catch (InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         }
     }
 
diff --git a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoService.java b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoService.java
index 68f8f2d3a..c5efd6fff 100644
--- a/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoService.java
+++ b/smack-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoService.java
@@ -104,7 +104,7 @@ public final class SignalOmemoService
             builder.process(contactsBundle);
             LOGGER.log(Level.FINE, "Session built with " + contactsDevice);
         } catch (org.whispersystems.libsignal.InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         } catch (UntrustedIdentityException e) {
             // This should never happen.
             throw new AssertionError(e);
diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/CorruptedOmemoKeyException.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/CorruptedOmemoKeyException.java
index 24f63be40..6a97c857c 100644
--- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/CorruptedOmemoKeyException.java
+++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/CorruptedOmemoKeyException.java
@@ -27,4 +27,8 @@ public class CorruptedOmemoKeyException extends Exception {
     public CorruptedOmemoKeyException(String message) {
         super(message);
     }
+
+    public CorruptedOmemoKeyException(Exception exception) {
+        super(exception);
+    }
 }