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

Merge pull request #1123 from profanity-im/fix/1093-already-started-message

Browse Source 
Print omemo start related msgs into correct window
This commit is contained in:
Michael Vetter
2019-06-07 22:16:33 +02:00
committed by GitHub
parent 1772236178 9516324248
commit 1f3d61e9f7
1 changed files with 25 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/command/cmd_funcs.c
View File

@@ -8060,6 +8060,8 @@ cmd_omemo_start(ProfWin *window, const char *const command, gchar **args)
return TRUE; return TRUE;
} }
ProfChatWin *chatwin = NULL;
// recipient supplied // recipient supplied
if (args[1]) { if (args[1]) {
char *contact = args[1]; char *contact = args[1];
@@ -8068,67 +8070,50 @@ cmd_omemo_start(ProfWin *window, const char *const command, gchar **args)
barejid = contact; barejid = contact;
} }
ProfChatWin *chatwin = wins_get_chat(barejid); chatwin = wins_get_chat(barejid);
if (!chatwin) { if (!chatwin) {
chatwin = chatwin_new(barejid); chatwin = chatwin_new(barejid);
} }
ui_focus_win((ProfWin*)chatwin); ui_focus_win((ProfWin*)chatwin);
} else {
if (window->type == WIN_CHAT) {
chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
}
}
if (chatwin) {
if (chatwin->pgp_send) { if (chatwin->pgp_send) {
win_println(window, THEME_DEFAULT, '!', "You must disable PGP encryption before starting an OMEMO session."); win_println((ProfWin*)chatwin, THEME_DEFAULT, '!', "You must disable PGP encryption before starting an OMEMO session.");
return TRUE; return TRUE;
} }
if (chatwin->is_otr) { if (chatwin->is_otr) {
win_println(window, THEME_DEFAULT, '!', "You must disable OTR encryption before starting an OMEMO session."); win_println((ProfWin*)chatwin, THEME_DEFAULT, '!', "You must disable OTR encryption before starting an OMEMO session.");
return TRUE; return TRUE;
} }
if (chatwin->is_omemo) { if (chatwin->is_omemo) {
win_println(window, THEME_DEFAULT, '!', "You are already in an OMEMO session."); win_println((ProfWin*)chatwin, THEME_DEFAULT, '!', "You are already in an OMEMO session.");
return TRUE; return TRUE;
} }
accounts_add_omemo_state(session_get_account_name(), barejid, TRUE); accounts_add_omemo_state(session_get_account_name(), chatwin->barejid, TRUE);
omemo_start_session(barejid); omemo_start_session(chatwin->barejid);
chatwin->is_omemo = TRUE; chatwin->is_omemo = TRUE;
} else { } else if (window->type == WIN_MUC) {
if (window->type == WIN_CHAT) { ProfMucWin *mucwin = (ProfMucWin*)window;
ProfChatWin *chatwin = (ProfChatWin*)window; assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->pgp_send) {
win_println(window, THEME_DEFAULT, '!', "You must disable PGP encryption before starting an OMEMO session.");
return TRUE;
}
if (chatwin->is_otr) { if (muc_anonymity_type(mucwin->roomjid) == MUC_ANONYMITY_TYPE_NONANONYMOUS) {
win_println(window, THEME_DEFAULT, '!', "You must disable OTR encryption before starting an OMEMO session."); accounts_add_omemo_state(session_get_account_name(), mucwin->roomjid, TRUE);
return TRUE; omemo_start_muc_sessions(mucwin->roomjid);
} mucwin->is_omemo = TRUE;
if (chatwin->is_omemo) {
win_println(window, THEME_DEFAULT, '!', "You are already in an OMEMO session.");
return TRUE;
}
accounts_add_omemo_state(session_get_account_name(), chatwin->barejid, TRUE);
omemo_start_session(chatwin->barejid);
chatwin->is_omemo = TRUE;
} else if (window->type == WIN_MUC) {
ProfMucWin *mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
if (muc_anonymity_type(mucwin->roomjid) == MUC_ANONYMITY_TYPE_NONANONYMOUS) {
accounts_add_omemo_state(session_get_account_name(), mucwin->roomjid, TRUE);
omemo_start_muc_sessions(mucwin->roomjid);
mucwin->is_omemo = TRUE;
} else {
win_println(window, THEME_DEFAULT, '!', "MUC must be non-anonymous (i.e. be configured to present real jid to anyone) in order to support OMEMO.");
}
} else { } else {
win_println(window, THEME_DEFAULT, '-', "You must be in a regular chat window to start an OMEMO session."); win_println(window, THEME_DEFAULT, '!', "MUC must be non-anonymous (i.e. be configured to present real jid to anyone) in order to support OMEMO.");
} }
} else {
win_println(window, THEME_DEFAULT, '-', "You must be in a regular chat window to start an OMEMO session.");
} }
return TRUE; return TRUE;