Improve OMEMO UX

src/command/cmd_defs.c

@@ -2332,13 +2332,18 @@ static const struct cmd_t command_defs[] = {
             "/omemo clear_device_list",
             "/omemo qrcode")
         CMD_DESC(
-            "OMEMO commands to manage keys, and perform encryption during chat sessions.")
+            "OMEMO commands to manage keys, and perform encryption during chat sessions.\n"
+            "The title bar will show the OMEMO session status:\n"
+            "[OMEMO][trusted]   - All active devices for the contact are trusted.\n"
+            "[OMEMO][untrusted] - One or more active devices for the contact are untrusted.\n")
         CMD_ARGS(
             { "gen",                     "Generate OMEMO cryptographic materials for current account." },
             { "start [<contact>]",       "Start an OMEMO session with contact, or current recipient if omitted." },
             { "end",                     "End the current OMEMO session." },
             { "log on|off",              "Enable or disable plaintext logging of OMEMO encrypted messages." },
             { "log redact",              "Log OMEMO encrypted messages, but replace the contents with [redacted]." },
+            { "trust [<contact>] <fp>",  "Trust a fingerprint for a contact, or current recipient if omitted. If all active devices are trusted, the title bar will show [trusted]. Otherwise, it will show [untrusted]." },
+            { "untrust [<contact>] <fp>","Untrust a fingerprint for a contact, or current recipient if omitted." },
             { "fingerprint [<contact>]", "Show contact's fingerprints, or current recipient's if omitted." },
             { "char <char>",             "Set the character to be displayed next to OMEMO encrypted messages." },
             { "trustmode manual",        "Set the global OMEMO trust mode to manual, OMEMO keys has to be trusted manually." },

src/command/cmd_funcs.c

@@ -8479,6 +8479,7 @@ cmd_omemo_start(ProfWin* window, const char* const command, gchar** args)
         }
 
         accounts_add_omemo_state(session_get_account_name(), chatwin->barejid, TRUE);
+        win_println((ProfWin*)chatwin, THEME_DEFAULT, "!", "Initiating OMEMO session with %s...", chatwin->barejid);
         omemo_start_session(chatwin->barejid);
         chatwin->is_omemo = TRUE;
     } else if (window->type == WIN_MUC) {
@@ -8493,6 +8494,7 @@ cmd_omemo_start(ProfWin* window, const char* const command, gchar** args)
         if (muc_anonymity_type(mucwin->roomjid) == MUC_ANONYMITY_TYPE_NONANONYMOUS
             && muc_member_type(mucwin->roomjid) == MUC_MEMBER_TYPE_MEMBERS_ONLY) {
             accounts_add_omemo_state(session_get_account_name(), mucwin->roomjid, TRUE);
+            win_println((ProfWin*)mucwin, THEME_DEFAULT, "!", "Initiating OMEMO session in %s...", mucwin->roomjid);
             omemo_start_muc_sessions(mucwin->roomjid);
             mucwin->is_omemo = TRUE;
         } else {
@@ -8686,8 +8688,9 @@ cmd_omemo_fingerprint(ProfWin* window, const char* const command, gchar** args)
     for (GList* fingerprint = fingerprints; fingerprint != NULL; fingerprint = fingerprint->next) {
         auto_char char* formatted_fingerprint = omemo_format_fingerprint(fingerprint->data);
         gboolean trusted = omemo_is_trusted_identity(jid->barejid, fingerprint->data);
+        gboolean active = omemo_is_device_active(jid->barejid, fingerprint->data);
 
-        win_println(window, THEME_DEFAULT, "-", "%s's OMEMO fingerprint: %s%s", jid->barejid, formatted_fingerprint, trusted ? " (trusted)" : "");
+        win_println(window, THEME_DEFAULT, "-", "%s's OMEMO fingerprint: %s%s%s", jid->barejid, formatted_fingerprint, trusted ? " (trusted)" : " (untrusted)", active ? " (active)" : " (inactive)");
     }
 
     g_list_free(fingerprints);