Merge pull request #1850 from H3rnand3zzz/feature/pgp-improved

Extend `/pgp` command to make key exchange procedure easier

tests/unittests/pgp/stub_gpg.c

@@ -98,3 +98,21 @@ p_gpg_format_fp_str(char* fp)
 {
     return NULL;
 }
+
+char*
+p_gpg_get_pubkey(const char* const keyid)
+{
+    return NULL;
+}
+
+gboolean
+p_gpg_is_public_key_format(const char* buffer)
+{
+    return TRUE;
+}
+
+ProfPGPKey*
+p_gpg_import_pubkey(const char* buffer)
+{
+    return NULL;
+}

tests/unittests/test_cmd_pgp.c

@@ -36,7 +36,7 @@ cmd_pgp_start_shows_message_when_connection(jabber_conn_status_t conn_status)
 
     will_return(connection_get_status, conn_status);
 
-    expect_cons_show("You must be connected to start PGP encrpytion.");
+    expect_cons_show("You must be connected to start PGP encryption.");
 
     gboolean result = cmd_pgp(&window, CMD_PGP, args);
     assert_true(result);
@@ -69,7 +69,7 @@ cmd_pgp_start_shows_message_when_no_arg_in_wintype(win_type_t wintype)
 
     will_return(connection_get_status, JABBER_CONNECTED);
 
-    expect_cons_show("You must be in a regular chat window to start PGP encrpytion.");
+    expect_cons_show("You must set recipient in an argument or be in a regular chat window to start PGP encryption.");
 
     gboolean result = cmd_pgp(&window, CMD_PGP, args);
     assert_true(result);