devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-27 07:26:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lucian/master'

Browse Source
This commit is contained in:
James Booth
2014-04-22 23:53:15 +01:00
parent 2c15aba92a 1192e67cf7
commit 1a0f12b0e6
8 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server_events.c
View File

@@ -32,6 +32,7 @@
#ifdef HAVE_LIBOTR
#include "otr/otr.h"
#include <libotr/proto.h>
#endif
#include "ui/ui.h"
@@ -206,7 +207,28 @@ handle_incoming_message(char *from, char *message, gboolean priv)
#ifdef HAVE_LIBOTR
gboolean was_decrypted = FALSE;
char *newmessage;
if (!priv) {
if (!priv) {
//check for OTR whitespace (opportunistic or always)
char *policy = prefs_get_string(PREF_OTR_POLICY);
if (strcmp(policy, "opportunistic") == 0 || strcmp(policy, "always") == 0) {
char *whitespace_base = strstr(message,OTRL_MESSAGE_TAG_BASE);
if (whitespace_base) {
if (strstr(message, OTRL_MESSAGE_TAG_V2) || strstr(message, OTRL_MESSAGE_TAG_V1)) {
// Remove whitespace pattern for proper display in UI
// Handle both BASE+TAGV1/2(16+8) and BASE+TAGV1+TAGV2(16+8+8)
int tag_length = 24;
if (strstr(message, OTRL_MESSAGE_TAG_V2) && strstr(message, OTRL_MESSAGE_TAG_V1)) {
tag_length = 32;
}
memmove(whitespace_base, whitespace_base+tag_length, tag_length);
log_debug("<%s>", message);
char *otr_query_message = otr_start_query();
cons_show("OTR Whitespace pattern detected. Attempting to start OTR session...");
message_send(otr_query_message, from);
}
}
}
newmessage = otr_decrypt_message(from, message, &was_decrypted);
// internal OTR message