char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Simplify the max keys calculation for one-time key uploads.

master
Damir Jelić 2020-06-04 17:36:33 +02:00
parent 62e959a94d
commit 6e5870bd2b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
matrix_sdk_crypto/src/machine.rs
View File

@ -546,17 +546,14 @@ impl OlmMachine {
match &self.uploaded_signed_key_count { match &self.uploaded_signed_key_count {
Some(count) => { Some(count) => {
let count = count.load(Ordering::Relaxed); let count = count.load(Ordering::Relaxed);
let max_keys = self.account.max_one_time_keys().await as u64; let max_keys = self.account.max_one_time_keys().await;
let max_on_server = max_keys / 2; let max_on_server = (max_keys as u64) / 2;
if count >= (max_on_server) { if count >= (max_on_server) {
return Err(()); return Err(());
} }
let key_count = (max_on_server) - count; let key_count = (max_on_server) - count;
let max_keys = self.account.max_one_time_keys().await;
let key_count: usize = key_count.try_into().unwrap_or(max_keys); let key_count: usize = key_count.try_into().unwrap_or(max_keys);
self.account.generate_one_time_keys(key_count).await; self.account.generate_one_time_keys(key_count).await;