From a3c0c24b7e688ce2787e1550f228403744d10063 Mon Sep 17 00:00:00 2001
From: Samuel Hand <samuel.hand@openmailbox.org>
Date: Wed, 4 Jul 2018 17:44:23 +0100
Subject: [PATCH] Fix a bug where notifications wouldn't display upon a new
 device being added

---
 plugins/omemo/src/device_notification_populator.vala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/omemo/src/device_notification_populator.vala b/plugins/omemo/src/device_notification_populator.vala
index 8549e052..a6a51742 100644
--- a/plugins/omemo/src/device_notification_populator.vala
+++ b/plugins/omemo/src/device_notification_populator.vala
@@ -26,8 +26,8 @@ public class DeviceNotificationPopulator : NotificationPopulator, Object {
     public void init(Conversation conversation, NotificationCollection notification_collection, Plugins.WidgetType type) {
         current_conversation = conversation;
         this.notification_collection = notification_collection;
-        stream_interactor.module_manager.get_module(conversation.account, StreamModule.IDENTITY).device_list_loaded.connect((jid) => {
-                if (jid == conversation.counterpart && has_new_devices(conversation.counterpart) && conversation.type_ == Conversation.Type.CHAT) {
+        stream_interactor.module_manager.get_module(conversation.account, StreamModule.IDENTITY).bundle_fetched.connect_after((jid, device_id, bundle) => {
+                if (jid.equals(conversation.counterpart) && has_new_devices(conversation.counterpart) && conversation.type_ == Conversation.Type.CHAT) {
                     display_notification();
                 }
             });