From 4b8c7dc6304db7cd90d23ab80d85c1d534684ef0 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Mon, 16 Jan 2017 20:43:06 +0100
Subject: partially improved logging for receiving omemo messages

---
 .../messenger/crypto/axolotl/XmppAxolotlSession.java | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java')

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 6a314a760..84237d645 100644
--- a/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java
+++ b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java
@@ -82,7 +82,7 @@ public class XmppAxolotlSession implements Comparable<XmppAxolotlSession> {
     }
 
     @Nullable
-    public byte[] processReceiving(AxolotlKey encryptedKey) {
+    public byte[] processReceiving(AxolotlKey encryptedKey) throws CryptoFailedException {
         byte[] plaintext = null;
         FingerprintStatus status = getTrust();
         if (!status.isCompromised()) {
@@ -90,8 +90,7 @@ public class XmppAxolotlSession implements Comparable<XmppAxolotlSession> {
                 try {
                     PreKeyWhisperMessage message = new PreKeyWhisperMessage(encryptedKey.key);
                     if (!message.getPreKeyId().isPresent()) {
-                        Log.w(Config.LOGTAG, AxolotlService.getLogprefix(account) + "PreKeyWhisperMessage did not contain a PreKeyId");
-                        return null;
+                        throw new CryptoFailedException("PreKeyWhisperMessage did not contain a PreKeyId");
                     }
                     Log.i(Config.LOGTAG, AxolotlService.getLogprefix(account) + "PreKeyWhisperMessage received, new session ID:" + message.getSignedPreKeyId() + "/" + message.getPreKeyId());
                     IdentityKey msgIdentityKey = message.getIdentityKey();
@@ -107,19 +106,20 @@ public class XmppAxolotlSession implements Comparable<XmppAxolotlSession> {
                     WhisperMessage message = new WhisperMessage(encryptedKey.key);
                     plaintext = cipher.decrypt(message);
                 } catch (InvalidKeyException | InvalidKeyIdException | UntrustedIdentityException e) {
-                    Log.w(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Error decrypting axolotl header, " + e.getClass().getName() + ": " + e.getMessage());
+                    throw new CryptoFailedException("Error decrypting axolotl header, \" + e.getClass().getName() + \": \" + e.getMessage()");
                 }
             } catch (LegacyMessageException | InvalidMessageException | DuplicateMessageException | NoSessionException e) {
-                Log.w(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Error decrypting axolotl header, " + e.getClass().getName() + ": " + e.getMessage());
+                throw new CryptoFailedException("Error decrypting axolotl header, \" + e.getClass().getName() + \": \" + e.getMessage()");
             }
 
-            if (plaintext != null) {
-                if (!status.isActive()) {
-                    setTrust(status.toActive());
-                }
+            if (plaintext == null) {
+                throw new CryptoFailedException("plaintext unexpectedly null");
+            }
+            if (!status.isActive()) {
+                setTrust(status.toActive());
             }
         } else {
-            Log.d(Config.LOGTAG, account.getJid().toBareJid() + " not encrypting omemo message from fingerprint " + getFingerprint() + " because it was marked as compromised");
+            throw new CryptoFailedException("not encrypting omemo message from fingerprint "+getFingerprint()+" because it was marked as compromised");
         }
         return plaintext;
     }
-- 
cgit v1.2.3