aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Merge pull request #1878 from profanity-im/fix/oxcarbon

Browse Source 
ox: correctly recognize ox encrypted carbons
This commit is contained in:
Michael Vetter 2023-08-25 08:36:36 +02:00 committed by GitHub
commit 568266ec6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/event/server_events.c
View File

@ -471,6 +471,8 @@ sv_ev_outgoing_carbon(ProfMessage* message)
if (message->enc == PROF_MSG_ENC_OMEMO) { if (message->enc == PROF_MSG_ENC_OMEMO) {
chatwin_outgoing_carbon(chatwin, message); chatwin_outgoing_carbon(chatwin, message);
} else if (message->enc == PROF_MSG_ENC_OX) {
chatwin_outgoing_carbon(chatwin, message);
} else if (message->encrypted) { } else if (message->encrypted) {
#ifdef HAVE_LIBGPGME #ifdef HAVE_LIBGPGME
message->plain = p_gpg_decrypt(message->encrypted); message->plain = p_gpg_decrypt(message->encrypted);

2
src/ui/chatwin.c
View File

@ -467,6 +467,8 @@ chatwin_outgoing_carbon(ProfChatWin* chatwin, ProfMessage* message)
enc_char = prefs_get_pgp_char(); enc_char = prefs_get_pgp_char();
} else if (message->enc == PROF_MSG_ENC_OMEMO) { } else if (message->enc == PROF_MSG_ENC_OMEMO) {
enc_char = prefs_get_omemo_char(); enc_char = prefs_get_omemo_char();
} else if (message->enc == PROF_MSG_ENC_OX) {
enc_char = prefs_get_ox_char();
} else { } else {
enc_char = strdup("-"); enc_char = strdup("-");
} }