mirror of
https://github.com/profanity-im/profanity.git
synced 2024-06-09 21:30:42 +00:00
Merge pull request #1887 from profanity-im/fix-omemo-keyfile-loading
Fix OMEMO keyfile loading
This commit is contained in:
commit
0de0594c5a
|
@ -230,24 +230,22 @@ omemo_on_connect(ProfAccount* account)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!load_custom_keyfile(&omemo_ctx.identity, g_strdup_printf("%s/%s", omemo_dir, "identity.txt")) || !_load_identity()) {
|
if (load_custom_keyfile(&omemo_ctx.identity, g_strdup_printf("%s/%s", omemo_dir, "identity.txt"))) {
|
||||||
return;
|
if (!_load_identity())
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!load_custom_keyfile(&omemo_ctx.trust, g_strdup_printf("%s/%s", omemo_dir, "trust.txt"))) {
|
if (load_custom_keyfile(&omemo_ctx.trust, g_strdup_printf("%s/%s", omemo_dir, "trust.txt"))) {
|
||||||
return;
|
_load_trust();
|
||||||
}
|
}
|
||||||
_load_trust();
|
|
||||||
|
|
||||||
if (!load_custom_keyfile(&omemo_ctx.sessions, g_strdup_printf("%s/%s", omemo_dir, "sessions.txt"))) {
|
if (load_custom_keyfile(&omemo_ctx.sessions, g_strdup_printf("%s/%s", omemo_dir, "sessions.txt"))) {
|
||||||
return;
|
_load_sessions();
|
||||||
}
|
}
|
||||||
_load_sessions();
|
|
||||||
|
|
||||||
if (!load_custom_keyfile(&omemo_ctx.knowndevices, g_strdup_printf("%s/%s", omemo_dir, "known_devices.txt"))) {
|
if (load_custom_keyfile(&omemo_ctx.knowndevices, g_strdup_printf("%s/%s", omemo_dir, "known_devices.txt"))) {
|
||||||
return;
|
_load_known_devices();
|
||||||
}
|
}
|
||||||
_load_known_devices();
|
|
||||||
|
|
||||||
omemo_devicelist_subscribe();
|
omemo_devicelist_subscribe();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user