aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
diff options
context:
space:
mode:
authorAndreas Straub <andreas.straub@rwth-aachen.de>2015-06-25 17:01:42 +0200
committerAndreas Straub <andy@strb.org>2015-07-19 21:32:26 +0200
commit065519d3f39f0a7b925157b50e4435957f63d8ae (patch)
treef1e818a4354ca53a5f4722a2e632cd73fc715f88 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
parent77619b55e47aafbe6b5a530b33ce8b6a77a615dd (diff)
Added axolotl activation code to UI
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index bed9267b..1ebe3a03 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -758,6 +758,15 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
}
}
break;
+ case Message.ENCRYPTION_AXOLOTL:
+ try {
+ packet = mMessageGenerator.generateAxolotlChat(message);
+ Log.d(Config.LOGTAG, "Succeeded generating axolotl chat message!");
+ } catch (NoSessionsCreatedException e) {
+ message.setStatus(Message.STATUS_WAITING);
+ }
+ break;
+
}
if (packet != null) {
if (account.getXmppConnection().getFeatures().sm() || conversation.getMode() == Conversation.MODE_MULTI) {