anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix OMEMO not working when the database is re-created for an existing account

Browse source
This commit is contained in:
Samuel Hand 2018-08-11 14:19:06 +01:00
parent 9d15c464c2
commit 72cb5b4f90
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/omemo/src/manager.vala
View file

@ -316,9 +316,11 @@ public class Manager : StreamInteractionModule, Object {
private void on_store_created(Account account, Store store) { private void on_store_created(Account account, Store store) {
Qlite.Row? row = db.identity.row_with(db.identity.account_id, account.id).inner; Qlite.Row? row = db.identity.row_with(db.identity.account_id, account.id).inner;
int identity_id = -1; int identity_id = -1;
bool publish_identity = false;
if (row == null) { if (row == null) {
// OMEMO not yet initialized, starting with empty base // OMEMO not yet initialized, starting with empty base
publish_identity = true;
try { try {
store.identity_key_store.local_registration_id = Random.int_range(1, int32.MAX); store.identity_key_store.local_registration_id = Random.int_range(1, int32.MAX);
@ -349,14 +351,21 @@ public class Manager : StreamInteractionModule, Object {
} else { } else {
print(@"OMEMO: store for $(account.bare_jid) is not persisted!"); print(@"OMEMO: store for $(account.bare_jid) is not persisted!");
} }
// Generated new device ID, ensure this gets added to the devicelist
if (publish_identity) {
XmppStream? stream = stream_interactor.get_stream(account);
if (stream == null) return;
StreamModule? module = ((!)stream).get_module(StreamModule.IDENTITY);
if(module == null) return;
module.request_user_devicelist(stream, account.bare_jid);
}
} }
public bool can_encrypt(Entities.Conversation conversation) { public bool can_encrypt(Entities.Conversation conversation) {
XmppStream? stream = stream_interactor.get_stream(conversation.account); XmppStream? stream = stream_interactor.get_stream(conversation.account);
if (stream == null) return false; if (stream == null) return false;
StreamModule? module = ((!)stream).get_module(StreamModule.IDENTITY);
if (module == null) return false;
if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat(conversation.counterpart, conversation.account)){ if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat(conversation.counterpart, conversation.account)){
Xep.Muc.Flag? flag = stream.get_flag(Xep.Muc.Flag.IDENTITY); Xep.Muc.Flag? flag = stream.get_flag(Xep.Muc.Flag.IDENTITY);
if (flag == null) return false; if (flag == null) return false;