Merge branch 'nyaaori/fix-otk-reporting' into 'next'

Always send device_one_time_keys_count, fixing #178 Closes #169 and #178 See merge request famedly/conduit!213
2021-10-15 13:01:52 +00:00 · 2021-10-15 13:01:52 +00:00 · e88929e154
parent dc8bc4a880 d996d1b0e6
commit e88929e154
1 changed files with 1 additions and 7 deletions
--- a/src/client_server/sync.rs
+++ b/src/client_server/sync.rs
@ -755,13 +755,7 @@ async fn sync_helper(
            changed: device_list_updates.into_iter().collect(),
            left: device_list_left.into_iter().collect(),
        },
-        device_one_time_keys_count: if db.users.last_one_time_keys_update(&sender_user)? > since
-            || since == 0
-        {
-            db.users.count_one_time_keys(&sender_user, &sender_device)?
-        } else {
-            BTreeMap::new()
-        },
+        device_one_time_keys_count: db.users.count_one_time_keys(&sender_user, &sender_device)?,
        to_device: sync_events::ToDevice {
            events: db
                .users