From d02f7b6a3ace7c9248db15996e7a6d50a22d2582 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Mon, 26 Aug 2019 17:20:10 +0200 Subject: [PATCH] Fix runtime critical --- plugins/omemo/src/logic/manager.vala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/omemo/src/logic/manager.vala b/plugins/omemo/src/logic/manager.vala index b90c868b..a71dfd9d 100644 --- a/plugins/omemo/src/logic/manager.vala +++ b/plugins/omemo/src/logic/manager.vala @@ -380,8 +380,11 @@ public class Manager : StreamInteractionModule, Object { public async bool ensure_get_keys_for_jid(Account account, Jid jid) { if (trust_manager.is_known_address(account, jid)) return true; XmppStream? stream = stream_interactor.get_stream(account); - var device_list = yield stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).request_user_devicelist((!)stream, jid); - return device_list.size > 0; + if (stream != null) { + var device_list = yield stream_interactor.module_manager.get_module(account, StreamModule.IDENTITY).request_user_devicelist(stream, jid); + return device_list.size > 0; + } + return true; // TODO wait for stream? } public static void start(StreamInteractor stream_interactor, Database db, TrustManager trust_manager) {