From df8b5fcb722c4a33ed18cbbaafecb206f127b849 Mon Sep 17 00:00:00 2001
From: Samuel Hand <samuel.hand@openmailbox.org>
Date: Fri, 8 Jun 2018 02:37:50 +0100
Subject: Properly handle the case where the recipients device list hasn't been
fetched
---
plugins/omemo/src/manager.vala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'plugins/omemo')
diff --git a/plugins/omemo/src/manager.vala b/plugins/omemo/src/manager.vala
index 00b73138..eb0c6378 100644
--- a/plugins/omemo/src/manager.vala
+++ b/plugins/omemo/src/manager.vala
@@ -37,12 +37,12 @@ public class Manager : StreamInteractionModule, Object {
this.waiting_other_sessions = new_try.other_unknown;
this.waiting_own_sessions = new_try.own_unknown;
this.waiting_own_devicelist = !new_try.own_list;
- this.waiting_other_devicelist = !new_try.own_list;
+ this.waiting_other_devicelist = !new_try.other_list;
this.active_send_attempt = false;
will_send_now = false;
if (new_try.other_failure > 0 || (new_try.other_lost == new_try.other_devices && new_try.other_devices > 0)) {
msg.marked = Entities.Message.Marked.WONTSEND;
- } else if (new_try.other_unknown > 0 || new_try.own_devices == 0) {
+ } else if (new_try.other_unknown > 0 || new_try.own_unknown > 0 || !new_try.other_list || !new_try.own_list || new_try.own_devices == 0) {
msg.marked = Entities.Message.Marked.UNSENT;
} else if (!new_try.encrypted) {
msg.marked = Entities.Message.Marked.WONTSEND;
--
cgit v1.2.3-70-g09d2