devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Split PGP incoming and outgoing message handling

Browse Source
This commit is contained in:
James Booth
2015-08-30 01:32:13 +01:00
parent 1484e94b35
commit b4722632b6
11 changed files with 142 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/command/commands.c
View File

@@ -4355,12 +4355,12 @@ cmd_pgp(ProfWin *window, const char * const command, gchar **args)
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
}
if (chatwin->enc_mode == PROF_ENC_OTR) {
if (chatwin->is_otr) {
ui_current_print_formatted_line('!', 0, "You must end the OTR session to start PGP encryption.");
return TRUE;
}
if (chatwin->enc_mode == PROF_ENC_PGP) {
if (chatwin->pgp_send) {
ui_current_print_formatted_line('!', 0, "You have already started PGP encryption.");
return TRUE;
}
@@ -4378,7 +4378,7 @@ cmd_pgp(ProfWin *window, const char * const command, gchar **args)
return TRUE;
}
chatwin->enc_mode = PROF_ENC_PGP;
chatwin->pgp_send = TRUE;
ui_current_print_formatted_line('!', 0, "PGP encyption enabled.");
return TRUE;
}
@@ -4396,12 +4396,12 @@ cmd_pgp(ProfWin *window, const char * const command, gchar **args)
}
ProfChatWin *chatwin = (ProfChatWin*)window;
if (chatwin->enc_mode != PROF_ENC_PGP) {
if (chatwin->pgp_send == FALSE) {
ui_current_print_formatted_line('!', 0, "PGP encryption is not currently enabled.");
return TRUE;
}
chatwin->enc_mode = PROF_ENC_NONE;
chatwin->pgp_send = FALSE;
ui_current_print_formatted_line('!', 0, "PGP encyption disabled.");
return TRUE;
}
@@ -4527,7 +4527,7 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->enc_mode != PROF_ENC_OTR) {
if (chatwin->is_otr == FALSE) {
ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session.");
return TRUE;
}
@@ -4552,12 +4552,12 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
}
ui_ev_focus_win((ProfWin*)chatwin);
if (chatwin->enc_mode == PROF_ENC_PGP) {
if (chatwin->pgp_send) {
ui_current_print_formatted_line('!', 0, "You must disable PGP encryption before starting an OTR session.");
return TRUE;
}
if (chatwin->enc_mode == PROF_ENC_OTR) {
if (chatwin->is_otr) {
ui_current_print_formatted_line('!', 0, "You are already in an OTR session.");
return TRUE;
}
@@ -4586,12 +4586,12 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->enc_mode == PROF_ENC_PGP) {
if (chatwin->pgp_send) {
ui_current_print_formatted_line('!', 0, "You must disable PGP encryption before starting an OTR session.");
return TRUE;
}
if (chatwin->enc_mode == PROF_ENC_OTR) {
if (chatwin->is_otr) {
ui_current_print_formatted_line('!', 0, "You are already in an OTR session.");
return TRUE;
}
@@ -4615,7 +4615,7 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->enc_mode != PROF_ENC_OTR) {
if (chatwin->is_otr == FALSE) {
ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session.");
return TRUE;
}
@@ -4632,7 +4632,7 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->enc_mode != PROF_ENC_OTR) {
if (chatwin->is_otr == FALSE) {
ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session.");
return TRUE;
}
@@ -4649,7 +4649,7 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->enc_mode != PROF_ENC_OTR) {
if (chatwin->is_otr == FALSE) {
ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session.");
return TRUE;
}
@@ -4666,7 +4666,7 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->enc_mode != PROF_ENC_OTR) {
if (chatwin->is_otr == FALSE) {
ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session.");
return TRUE;
}
@@ -4695,7 +4695,7 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->enc_mode != PROF_ENC_OTR) {
if (chatwin->is_otr == FALSE) {
ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session.");
return TRUE;
}
@@ -4711,7 +4711,7 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args)
ProfChatWin *chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
if (chatwin->enc_mode != PROF_ENC_OTR) {
if (chatwin->is_otr == FALSE) {
ui_current_print_formatted_line('!', 0, "You are not currently in an OTR session.");
return TRUE;
}