aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-06-29 14:25:23 +0200
committerAndreas Straub <andy@strb.org>2015-07-19 21:32:26 +0200
commit1b0596d57473f7aafa633ed2d5f3b3610a653a51 (patch)
tree189fdb97331858d8ada18fa147ee91dcdfcbfe02 /src/main/java
parent3815d4efa378846c8aef840ad659268a0bef1536 (diff)
Tag messages with originating session
This can be used later in order to display trust status of messages, as well as for potential resending of messages in case of preKey conflicts.
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java5
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java4
2 files changed, 9 insertions, 0 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 e1b95650..01b06c22 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
@@ -75,6 +75,11 @@ public class XmppAxolotlMessage {
public String getPlaintext() {
return plaintext;
}
+
+ public AxolotlService.XmppAxolotlSession getSession() {
+ return session;
+ }
+
}
public XmppAxolotlMessage(Contact contact, Element axolotlMessage) {
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 336af972..b1dffc82 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -670,4 +670,8 @@ public class Message extends AbstractEntity {
public boolean isTrusted() {
return this.axolotlSession != null && this.axolotlSession.isTrusted();
}
+
+ public void setAxolotlSession(AxolotlService.XmppAxolotlSession session) {
+ this.axolotlSession = session;
+ }
}