From 03f25e1f87dd4608c7cf4d0f97d1cb2e0141094d Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 21 May 2019 21:42:39 +0200 Subject: Remove Message.stanza field --- plugins/http-files/src/file_provider.vala | 2 +- plugins/omemo/src/device_notification_populator.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/http-files/src/file_provider.vala b/plugins/http-files/src/file_provider.vala index 34106d42..06b20e92 100644 --- a/plugins/http-files/src/file_provider.vala +++ b/plugins/http-files/src/file_provider.vala @@ -37,7 +37,7 @@ public class FileProvider : Dino.FileProvider, Object { public override async bool run(Entities.Message message, Xmpp.MessageStanza stanza, Conversation conversation) { if (outer.url_regex.match(message.body)) { - string? oob_url = Xmpp.Xep.OutOfBandData.get_url_from_message(message.stanza); + string? oob_url = Xmpp.Xep.OutOfBandData.get_url_from_message(stanza); if (oob_url != null && oob_url == message.body) { yield outer.on_file_message(message, conversation); } diff --git a/plugins/omemo/src/device_notification_populator.vala b/plugins/omemo/src/device_notification_populator.vala index bcb99f11..5b47611c 100644 --- a/plugins/omemo/src/device_notification_populator.vala +++ b/plugins/omemo/src/device_notification_populator.vala @@ -56,7 +56,7 @@ public class DeviceNotificationPopulator : NotificationPopulator, Object { private void on_account_added(Account account) { stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).bundle_fetched.connect_after((jid, device_id, bundle) => { - if (jid.equals(current_conversation.counterpart) && has_new_devices(current_conversation.counterpart)) { + if (current_conversation != null && jid.equals(current_conversation.counterpart) && has_new_devices(current_conversation.counterpart)) { display_notification(); } }); -- cgit v1.2.3-54-g00ecf