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

Don't forget encryption status for OX and PGP.

Browse Source 
Use a pgp.enabled and ox.enabled array the same way that omemo.enabled
is used.

Fixes https://github.com/profanity-im/profanity/issues/1694
Fixes https://github.com/profanity-im/profanity/issues/733
This commit is contained in:
MarcoPolo-PasTonMolo
2022-06-17 15:43:54 +03:00
parent 476c73251c
commit e4e53d6e01
12 changed files with 161 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/config/account.c
View File

@@ -57,8 +57,9 @@ account_new(const gchar* const name, const gchar* const jid,
const gchar* const muc_service, const gchar* const muc_nick,
const gchar* const otr_policy, GList* otr_manual, GList* otr_opportunistic,
GList* otr_always, const gchar* const omemo_policy, GList* omemo_enabled,
GList* omemo_disabled, const gchar* const pgp_keyid, const char* const startscript,
const char* const theme, gchar* tls_policy, gchar* auth_policy)
GList* omemo_disabled, GList* ox_enabled, GList* pgp_enabled,
const gchar* const pgp_keyid, const char* const startscript, const char* const theme,
gchar* tls_policy, gchar* auth_policy)
{
ProfAccount* new_account = malloc(sizeof(ProfAccount));
memset(new_account, 0, sizeof(ProfAccount));
@@ -154,6 +155,10 @@ account_new(const gchar* const name, const gchar* const jid,
new_account->omemo_enabled = omemo_enabled;
new_account->omemo_disabled = omemo_disabled;
new_account->ox_enabled = ox_enabled;
new_account->pgp_enabled = pgp_enabled;
if (pgp_keyid != NULL) {
new_account->pgp_keyid = strdup(pgp_keyid);
} else {
@@ -281,6 +286,8 @@ account_free(ProfAccount* account)
g_list_free_full(account->otr_always, g_free);
g_list_free_full(account->omemo_enabled, g_free);
g_list_free_full(account->omemo_disabled, g_free);
g_list_free_full(account->ox_enabled, g_free);
g_list_free_full(account->pgp_enabled, g_free);
free(account);
}

7
src/config/account.h
View File

@@ -64,6 +64,8 @@ typedef struct prof_account_t
gchar* omemo_policy;
GList* omemo_enabled;
GList* omemo_disabled;
GList* ox_enabled;
GList* pgp_enabled;
gchar* pgp_keyid;
gchar* startscript;
gchar* theme;
@@ -79,8 +81,9 @@ ProfAccount* account_new(const gchar* const name, const gchar* const jid,
const gchar* const muc_service, const gchar* const muc_nick,
const gchar* const otr_policy, GList* otr_manual, GList* otr_opportunistic,
GList* otr_always, const gchar* const omemo_policy, GList* omemo_enabled,
GList* omemo_disabled, const gchar* const pgp_keyid, const char* const startscript,
const char* const theme, gchar* tls_policy, gchar* auth_policy);
GList* omemo_disabled, GList* ox_enabled, GList* pgp_enabled, const gchar* const pgp_keyid,
const char* const startscript, const char* const theme, gchar* tls_policy,
gchar* auth_policy);
char* account_create_connect_jid(ProfAccount* account);
gboolean account_eval_password(ProfAccount* account);
void account_free(ProfAccount* account);

70
src/config/accounts.c
View File

@@ -283,21 +283,39 @@ accounts_get_account(const char* const name)
}
GList* omemo_enabled = NULL;
gchar** enabled_list = g_key_file_get_string_list(accounts, name, "omemo.enabled", &length, NULL);
if (enabled_list) {
gchar** omemo_enabled_list = g_key_file_get_string_list(accounts, name, "omemo.enabled", &length, NULL);
if (omemo_enabled_list) {
for (int i = 0; i < length; i++) {
omemo_enabled = g_list_append(omemo_enabled, strdup(enabled_list[i]));
omemo_enabled = g_list_append(omemo_enabled, strdup(omemo_enabled_list[i]));
}
g_strfreev(enabled_list);
g_strfreev(omemo_enabled_list);
}
GList* omemo_disabled = NULL;
gchar** disabled_list = g_key_file_get_string_list(accounts, name, "omemo.disabled", &length, NULL);
if (disabled_list) {
gchar** omemo_disabled_list = g_key_file_get_string_list(accounts, name, "omemo.disabled", &length, NULL);
if (omemo_disabled_list) {
for (int i = 0; i < length; i++) {
omemo_disabled = g_list_append(omemo_disabled, strdup(disabled_list[i]));
omemo_disabled = g_list_append(omemo_disabled, strdup(omemo_disabled_list[i]));
}
g_strfreev(disabled_list);
g_strfreev(omemo_disabled_list);
}
GList* ox_enabled = NULL;
gchar** ox_enabled_list = g_key_file_get_string_list(accounts, name, "ox.enabled", &length, NULL);
if (ox_enabled_list) {
for (int i = 0; i < length; i++) {
ox_enabled = g_list_append(ox_enabled, strdup(ox_enabled_list[i]));
}
g_strfreev(ox_enabled_list);
}
GList* pgp_enabled = NULL;
gchar** pgp_enabled_list = g_key_file_get_string_list(accounts, name, "pgp.enabled", &length, NULL);
if (pgp_enabled_list) {
for (int i = 0; i < length; i++) {
pgp_enabled = g_list_append(pgp_enabled, strdup(pgp_enabled_list[i]));
}
g_strfreev(pgp_enabled_list);
}
gchar* pgp_keyid = NULL;
@@ -328,8 +346,8 @@ accounts_get_account(const char* const name)
priority_online, priority_chat, priority_away, priority_xa,
priority_dnd, muc_service, muc_nick, otr_policy, otr_manual,
otr_opportunistic, otr_always, omemo_policy, omemo_enabled,
omemo_disabled, pgp_keyid, startscript, theme, tls_policy,
auth_policy);
omemo_disabled, ox_enabled, pgp_enabled, pgp_keyid,
startscript, theme, tls_policy, auth_policy);
g_free(jid);
g_free(password);
@@ -415,6 +433,8 @@ accounts_rename(const char* const account_name, const char* const new_name)
"omemo.policy",
"omemo.enabled",
"omemo.disabled",
"ox.enabled",
"pgp.enabled",
"pgp.keyid",
"last.activity",
"script.start",
@@ -677,6 +697,36 @@ accounts_add_omemo_state(const char* const account_name, const char* const conta
}
}
void
accounts_add_ox_state(const char* const account_name, const char* const contact_jid, gboolean enabled)
{
if (accounts_account_exists(account_name)) {
if (enabled) {
conf_string_list_add(accounts, account_name, "ox.enabled", contact_jid);
} else {
conf_string_list_remove(accounts, account_name, "ox.enabled", contact_jid);
}
_save_accounts();
}
}
void
accounts_add_pgp_state(const char* const account_name, const char* const contact_jid, gboolean enabled)
{
if (accounts_account_exists(account_name)) {
if (enabled) {
conf_string_list_add(accounts, account_name, "pgp.enabled", contact_jid);
conf_string_list_remove(accounts, account_name, "pgp.disabled", contact_jid);
} else {
conf_string_list_add(accounts, account_name, "pgp.disabled", contact_jid);
conf_string_list_remove(accounts, account_name, "pgp.enabled", contact_jid);
}
_save_accounts();
}
}
void
accounts_clear_omemo_state(const char* const account_name, const char* const contact_jid)
{

2
src/config/accounts.h
View File

@@ -100,6 +100,8 @@ void accounts_clear_muc(const char* const account_name);
void accounts_clear_resource(const char* const account_name);
void accounts_add_otr_policy(const char* const account_name, const char* const contact_jid, const char* const policy);
void accounts_add_omemo_state(const char* const account_name, const char* const contact_jid, gboolean enabled);
void accounts_add_ox_state(const char* const account_name, const char* const contact_jid, gboolean enabled);
void accounts_add_pgp_state(const char* const account_name, const char* const contact_jid, gboolean enabled);
void accounts_clear_omemo_state(const char* const account_name, const char* const contact_jid);
#endif