anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Properly handle the case where the recipients device list hasn't been fetched

Browse source
This commit is contained in:
Samuel Hand 2018-06-08 02:37:50 +01:00 committed by fiaxh
parent babe987dcb
commit df8b5fcb72
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/omemo/src/manager.vala
View file

@ -37,12 +37,12 @@ public class Manager : StreamInteractionModule, Object {
this.waiting_other_sessions = new_try.other_unknown; this.waiting_other_sessions = new_try.other_unknown;
this.waiting_own_sessions = new_try.own_unknown; this.waiting_own_sessions = new_try.own_unknown;
this.waiting_own_devicelist = !new_try.own_list; 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; this.active_send_attempt = false;
will_send_now = false; will_send_now = false;
if (new_try.other_failure > 0 || (new_try.other_lost == new_try.other_devices && new_try.other_devices > 0)) { 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; 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; msg.marked = Entities.Message.Marked.UNSENT;
} else if (!new_try.encrypted) { } else if (!new_try.encrypted) {
msg.marked = Entities.Message.Marked.WONTSEND; msg.marked = Entities.Message.Marked.WONTSEND;