diff options
Diffstat (limited to 'src/command')
-rw-r--r-- | src/command/cmd_ac.c | 1 | ||||
-rw-r--r-- | src/command/cmd_defs.c | 9 | ||||
-rw-r--r-- | src/command/cmd_funcs.c | 23 | ||||
-rw-r--r-- | src/command/cmd_funcs.h | 1 |
4 files changed, 31 insertions, 3 deletions
diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 9fc70a1d..531d189b 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -700,6 +700,7 @@ cmd_ac_init(void) autocomplete_add(omemo_ac, "policy"); autocomplete_add(omemo_ac, "trustmode"); autocomplete_add(omemo_ac, "char"); + autocomplete_add(omemo_ac, "qrcode"); omemo_log_ac = autocomplete_new(); autocomplete_add(omemo_log_ac, "on"); diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index 57d90226..411de396 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -2312,7 +2312,8 @@ static struct cmd_t command_defs[] = { { "fingerprint", cmd_omemo_fingerprint }, { "char", cmd_omemo_char }, { "policy", cmd_omemo_policy }, - { "clear_device_list", cmd_omemo_clear_device_list }) + { "clear_device_list", cmd_omemo_clear_device_list }, + { "qrcode", cmd_omemo_qrcode }) CMD_NOMAINFUNC CMD_TAGS( CMD_TAG_CHAT, @@ -2327,7 +2328,8 @@ static struct cmd_t command_defs[] = { "/omemo char <char>", "/omemo trustmode manual|firstusage|blind", "/omemo policy manual|automatic|always", - "/omemo clear_device_list") + "/omemo clear_device_list", + "/omemo qrcode") CMD_DESC( "OMEMO commands to manage keys, and perform encryption during chat sessions.") CMD_ARGS( @@ -2344,7 +2346,8 @@ static struct cmd_t command_defs[] = { { "policy manual", "Set the global OMEMO policy to manual, OMEMO sessions must be started manually." }, { "policy automatic", "Set the global OMEMO policy to opportunistic, an OMEMO session will be attempted upon starting a conversation." }, { "policy always", "Set the global OMEMO policy to always, an error will be displayed if an OMEMO session cannot be initiated upon starting a conversation." }, - { "clear_device_list", "Clear your own device list on server side. Each client will reannounce itself when connected back."}) + { "clear_device_list", "Clear your own device list on server side. Each client will reannounce itself when connected back."}, + { "qrcode", "Display QR code of your OMEMO fingerprint"}) CMD_EXAMPLES( "/omemo gen", "/omemo start odin@valhalla.edda", diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index 2a8331d1..1a4d4bf1 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -9036,6 +9036,29 @@ cmd_omemo_policy(ProfWin* window, const char* const command, gchar** args) } gboolean +cmd_omemo_qrcode(ProfWin* window, const char* const command, gchar** args) +{ +#ifdef HAVE_OMEMO + if (connection_get_status() != JABBER_CONNECTED) { + cons_show("You must be connected with an account to load OMEMO information."); + return TRUE; + } + + if (!omemo_loaded()) { + win_println(window, THEME_DEFAULT, "!", "You have not generated or loaded a cryptographic materials, use '/omemo gen'"); + return TRUE; + } + + char* fingerprint = omemo_own_fingerprint(TRUE); + cons_show_omemo_qrcode(fingerprint); + return TRUE; +#else + cons_show("This version of Profanity has not been built with OMEMO support enabled"); + return TRUE; +#endif +} + +gboolean cmd_save(ProfWin* window, const char* const command, gchar** args) { log_info("Saving preferences to configuration file"); diff --git a/src/command/cmd_funcs.h b/src/command/cmd_funcs.h index 621dd1c6..adc6793d 100644 --- a/src/command/cmd_funcs.h +++ b/src/command/cmd_funcs.h @@ -227,6 +227,7 @@ gboolean cmd_omemo_untrust(ProfWin* window, const char* const command, gchar** a gboolean cmd_omemo_trust_mode(ProfWin* window, const char* const command, gchar** args); gboolean cmd_omemo_policy(ProfWin* window, const char* const command, gchar** args); gboolean cmd_omemo_clear_device_list(ProfWin* window, const char* const command, gchar** args); +gboolean cmd_omemo_qrcode(ProfWin* window, const char* const command, gchar** args); gboolean cmd_save(ProfWin* window, const char* const command, gchar** args); gboolean cmd_reload(ProfWin* window, const char* const command, gchar** args); |