aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorSamuel Hand <samuel.hand@openmailbox.org>2018-06-08 02:37:50 +0100
committerSamuel Hand <samuel.hand@openmailbox.org>2018-06-08 02:37:50 +0100
commit630df3a2ee3ac5086ab15ecbb4da88e0e2e9c82d (patch)
treeef3c3fc70320a0b966bca606600f127b4ba8f9d6 /plugins
parentbbe578343e5544aea2b57aebcadb37a1b31c8ba2 (diff)
downloaddino-630df3a2ee3ac5086ab15ecbb4da88e0e2e9c82d.tar.gz
dino-630df3a2ee3ac5086ab15ecbb4da88e0e2e9c82d.zip
Properly handle the case where the recipients device list hasn't been fetched
Diffstat (limited to 'plugins')
-rw-r--r--plugins/omemo/src/manager.vala4
1 files changed, 2 insertions, 2 deletions
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;