Overhauled Message tagging

Messages are now tagged with the IdentityKey fingerprint of the
originating session. IdentityKeys have one of three trust states:
undecided (default), trusted, and untrusted/not yet trusted.

1 files changed, 8 insertions, 3 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
index 06dd2cda..45995228 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
@@ -67,10 +67,12 @@ public class XmppAxolotlMessage {
 	public static class XmppAxolotlPlaintextMessage {
 		private final AxolotlService.XmppAxolotlSession session;
 		private final String plaintext;
+		private final String fingerprint;
 
-		public XmppAxolotlPlaintextMessage(AxolotlService.XmppAxolotlSession session, String plaintext) {
+		public XmppAxolotlPlaintextMessage(AxolotlService.XmppAxolotlSession session, String plaintext, String fingerprint) {
 			this.session = session;
 			this.plaintext = plaintext;
+			this.fingerprint = fingerprint;
 		}
 
 		public String getPlaintext() {
@@ -81,6 +83,9 @@ public class XmppAxolotlMessage {
 			return session;
 		}
 
+		public String getFingerprint() {
+			return fingerprint;
+		}
 	}
 
 	public XmppAxolotlMessage(Jid from, Element axolotlMessage) {
@@ -167,7 +172,7 @@ public class XmppAxolotlMessage {
 	}
 
 
-	public XmppAxolotlPlaintextMessage decrypt(AxolotlService.XmppAxolotlSession session, byte[] key) {
+	public XmppAxolotlPlaintextMessage decrypt(AxolotlService.XmppAxolotlSession session, byte[] key, String fingerprint) {
 		XmppAxolotlPlaintextMessage plaintextMessage = null;
 		try {
 
@@ -178,7 +183,7 @@ public class XmppAxolotlMessage {
 			cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec);
 
 			String plaintext = new String(cipher.doFinal(ciphertext));
-			plaintextMessage = new XmppAxolotlPlaintextMessage(session, plaintext);
+			plaintextMessage = new XmppAxolotlPlaintextMessage(session, plaintext, fingerprint);
 
 		} catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException
 				| InvalidAlgorithmParameterException | IllegalBlockSizeException