Make CorruptedOmemoKeyException not swallow exceptions

TheHemantKaushik · Jun 20, 2018 · 6e9fb17 · 6e9fb17
1 parent ac347fc
commit 6e9fb17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/...k-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java b/...k-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoKeyUtil.java
@@ -70,7 +70,7 @@ public SignedPreKeyRecord generateOmemoSignedPreKey(IdentityKeyPair identityKeyP
         try {
             return KeyHelper.generateSignedPreKey(identityKeyPair, currentPreKeyId);
         } catch (InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         }
     }
 
@@ -102,7 +102,7 @@ public IdentityKeyPair identityKeyPairFromBytes(byte[] data) throws CorruptedOme
         try {
             return new IdentityKeyPair(data);
         } catch (InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         }
     }
 
@@ -112,7 +112,7 @@ public IdentityKey identityKeyFromBytes(byte[] data) throws CorruptedOmemoKeyExc
         try {
             return new IdentityKey(data, 0);
         } catch (InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         }
     }
 
@@ -122,7 +122,7 @@ public ECPublicKey ellipticCurvePublicKeyFromBytes(byte[] data) throws Corrupted
         try {
             return Curve.decodePoint(data, 0);
         } catch (InvalidKeyException e) {
-            throw new CorruptedOmemoKeyException(e.getMessage());
+            throw new CorruptedOmemoKeyException(e);
         }
     }
 

diff --git a/...k-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoService.java b/...k-omemo-signal/src/main/java/org/jivesoftware/smackx/omemo/signal/SignalOmemoService.java
@@ -104,7 +104,7 @@ protected void processBundle(OmemoManager omemoManager,
             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/...mo/src/main/java/org/jivesoftware/smackx/omemo/exceptions/CorruptedOmemoKeyException.java b/...mo/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);
+    }
 }