about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorPaul Fariello <paul@fariello.eu>2019-04-17 15:53:44 +0200
committerPaul Fariello <paul@fariello.eu>2019-04-17 15:54:15 +0200
commitdb55e01dce77dc4c23471afcfc3bd8eeeebf2896 (patch)
treeab64f899b2ed054ec3d5fa0e4d47a0fc34da6e03 /src
parent3d3eabb63fe9627c8eb8065b1753f217547ad49f (diff)
downloadprofani-tty-db55e01dce77dc4c23471afcfc3bd8eeeebf2896.tar.gz
Follow OMEMO policy even when opening window on message and carbon reception
This should close #1052
Diffstat (limited to 'src')
-rw-r--r--src/event/server_events.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/event/server_events.c b/src/event/server_events.c
index 36db8ebe..4366b2ab 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -521,6 +521,13 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *pgp_m
         ProfWin *window = wins_new_chat(barejid);
         chatwin = (ProfChatWin*)window;
         new_win = TRUE;
+
+#ifdef HAVE_OMEMO
+        if (omemo_automatic_start(barejid)) {
+            omemo_start_session(barejid);
+            chatwin->is_omemo = TRUE;
+        }
+#endif
     }
 
 // OTR suported, PGP supported, OMEMO unsupported
@@ -657,6 +664,13 @@ sv_ev_incoming_carbon(char *barejid, char *resource, char *message, char *pgp_me
         ProfWin *window = wins_new_chat(barejid);
         chatwin = (ProfChatWin*)window;
         new_win = TRUE;
+
+#ifdef HAVE_OMEMO
+        if (omemo_automatic_start(barejid)) {
+            omemo_start_session(barejid);
+            chatwin->is_omemo = TRUE;
+        }
+#endif
     }
 
 #ifdef HAVE_LIBGPGME