aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-22 19:45:54 -04:00
Code

Merge pull request #1553 from DebXWoody/bugfix/fix1552

Browse Source 
OMEMO: Separate handling of device list

Two changes: 
* First register the handler before sending the request
* Don't add own jid to handler
This commit is contained in:
Michael Vetter 2021-06-09 10:08:21 +02:00 committed by GitHub
commit d7adec69ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/omemo/omemo.c
View File

@ -367,6 +367,8 @@ omemo_generate_crypto_materials(ProfAccount* account)
void
omemo_publish_crypto_materials(void)
{
log_debug("[OMEMO] publish crypto materials");
if (loaded != TRUE) {
cons_show("OMEMO: cannot publish crypto materials before they are generated");
log_error("[OMEMO] cannot publish crypto materials before they are generated");
@ -408,8 +410,14 @@ omemo_start_session(const char* const barejid)
GList* device_list = g_hash_table_lookup(omemo_ctx.device_list, barejid);
if (!device_list) {
log_debug("[OMEMO] missing device list for %s", barejid);
// Own devices are handled by _handle_own_device_list
// We won't add _handle_device_list_start_session for ourself
char* mybarejid = connection_get_barejid();
if( g_strcmp0(mybarejid, barejid ) != 0 ) {
g_hash_table_insert(omemo_ctx.device_list_handler, strdup(barejid), _handle_device_list_start_session);
}
free(mybarejid);
omemo_devicelist_request(barejid);
g_hash_table_insert(omemo_ctx.device_list_handler, strdup(barejid), _handle_device_list_start_session);
return;
}
@ -525,6 +533,7 @@ omemo_prekeys(GList** prekeys, GList** ids, GList** lengths)
void
omemo_set_device_list(const char* const from, GList* device_list)
{
log_debug("[OMEMO] Setting device list for %s", from);
Jid* jid;
if (from) {
jid = jid_create(from);
@ -540,6 +549,8 @@ omemo_set_device_list(const char* const from, GList* device_list)
if (!keep) {
g_hash_table_remove(omemo_ctx.device_list_handler, jid->barejid);
}
} else {
log_debug("[OMEMO] No Device List Handler for %s", from);
}
// OMEMO trustmode ToFu