From 5d32a0ec3d85295f2286fbbab650c852b13a437c Mon Sep 17 00:00:00 2001
From: Samuel Hand <samuel.hand@openmailbox.org>
Date: Sat, 28 Jul 2018 19:03:52 +0100
Subject: Fix omemo not being available on first startup

---
 plugins/omemo/src/trust_manager.vala | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins/omemo/src/trust_manager.vala')

diff --git a/plugins/omemo/src/trust_manager.vala b/plugins/omemo/src/trust_manager.vala
index 408faed8..7e17e5ea 100644
--- a/plugins/omemo/src/trust_manager.vala
+++ b/plugins/omemo/src/trust_manager.vala
@@ -118,8 +118,9 @@ public class TrustManager {
 
     public Gee.List<int32> get_trusted_devices(Account account, Jid jid) {
         Gee.List<int32> devices = new ArrayList<int32>();
-        foreach (Row device in db.identity_meta.with_address(account.id, jid.to_string()).with(db.identity_meta.trust_level, "!=", Database.IdentityMetaTable.TrustLevel.UNKNOWN).with(db.identity_meta.trust_level, "!=", Database.IdentityMetaTable.TrustLevel.UNTRUSTED).without_null(db.identity_meta.identity_key_public_base64)) {
-            devices.add(device[db.identity_meta.device_id]);
+        foreach (Row device in db.identity_meta.with_address(account.id, jid.to_string()).with(db.identity_meta.trust_level, "!=", Database.IdentityMetaTable.TrustLevel.UNTRUSTED)) {
+            if(device[db.identity_meta.trust_level] != Database.IdentityMetaTable.TrustLevel.UNKNOWN || device[db.identity_meta.identity_key_public_base64] == null)
+                devices.add(device[db.identity_meta.device_id]);
         }
         return devices;
     }
-- 
cgit v1.2.3-70-g09d2