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

Merge branch 'master' into omemo-muc

Browse source
This commit is contained in:
Samuel Hand 2018-08-11 12:27:57 +01:00
parent d7b5db1d9f ee5c838a6b
commit 9d15c464c2
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libdino/src/service/muc_manager.vala
View file

@ -378,9 +378,9 @@ public class MucManager : StreamInteractionModule, Object {
m.marked = Message.Marked.RECEIVED; m.marked = Message.Marked.RECEIVED;
} }
} }
// For own messages from other devices (msg is not a duplicate msg)
message.marked = Message.Marked.RECEIVED;
} }
// For own messages from other devices (msg is not a duplicate msg)
message.marked = Message.Marked.RECEIVED;
return false; return false;
} }

2
plugins/openpgp/src/encryption_list_entry.vala
View file

@ -32,7 +32,7 @@ private class EncryptionListEntry : Plugins.EncryptionListEntry, Object {
Gee.List<Jid>? occupants = stream_interactor.get_module(MucManager.IDENTITY).get_occupants(conversation.counterpart, conversation.account); Gee.List<Jid>? occupants = stream_interactor.get_module(MucManager.IDENTITY).get_occupants(conversation.counterpart, conversation.account);
if (occupants != null) muc_jids.add_all(occupants); if (occupants != null) muc_jids.add_all(occupants);
Gee.List<Jid>? offline_members = stream_interactor.get_module(MucManager.IDENTITY).get_offline_members(conversation.counterpart, conversation.account); Gee.List<Jid>? offline_members = stream_interactor.get_module(MucManager.IDENTITY).get_offline_members(conversation.counterpart, conversation.account);
if (occupants != null) muc_jids.add_all(offline_members); if (offline_members != null) muc_jids.add_all(offline_members);
foreach (Jid jid in muc_jids) { foreach (Jid jid in muc_jids) {
string? key_id = stream_interactor.get_module(Manager.IDENTITY).get_key_id(conversation.account, jid); string? key_id = stream_interactor.get_module(Manager.IDENTITY).get_key_id(conversation.account, jid);