From 41c333263b82070c731f8f5b5183bafde4ab3f5d Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 3 Aug 2018 19:45:07 +0200 Subject: [PATCH 1/2] pgp: Fix checking wrong variable for null --- plugins/openpgp/src/encryption_list_entry.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/openpgp/src/encryption_list_entry.vala b/plugins/openpgp/src/encryption_list_entry.vala index 7ccd9f73..603c5c94 100644 --- a/plugins/openpgp/src/encryption_list_entry.vala +++ b/plugins/openpgp/src/encryption_list_entry.vala @@ -32,7 +32,7 @@ private class EncryptionListEntry : Plugins.EncryptionListEntry, Object { Gee.List? occupants = stream_interactor.get_module(MucManager.IDENTITY).get_occupants(conversation.counterpart, conversation.account); if (occupants != null) muc_jids.add_all(occupants); Gee.List? 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) { string? key_id = stream_interactor.get_module(Manager.IDENTITY).get_key_id(conversation.account, jid); From ee5c838a6ba85c9d6e72ac2941a7994505aaa4fc Mon Sep 17 00:00:00 2001 From: fiaxh Date: Mon, 6 Aug 2018 00:51:23 +0200 Subject: [PATCH 2/2] Fix MUC messages from others being marked as read --- libdino/src/service/muc_manager.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala index e9ad1b81..b69d71f2 100644 --- a/libdino/src/service/muc_manager.vala +++ b/libdino/src/service/muc_manager.vala @@ -378,9 +378,9 @@ public class MucManager : StreamInteractionModule, Object { 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; }