rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: Use the key import progress listener on the rust side

Browse Source
This commit is contained in:
Damir Jelić 2021-04-14 12:14:52 +02:00
parent 543a638e87
commit 7d67c79d29
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rust-sdk/src/machine.rs
View File

@ -450,13 +450,18 @@ impl OlmMachine {
&self, &self,
keys: &str, keys: &str,
passphrase: &str, passphrase: &str,
_progress_listener: Box<dyn ProgressListener>, progress_listener: Box<dyn ProgressListener>,
) -> Result<KeysImportResult, KeyImportError> { ) -> Result<KeysImportResult, KeyImportError> {
let keys = Cursor::new(keys); let keys = Cursor::new(keys);
let keys = decrypt_key_export(keys, passphrase)?; let keys = decrypt_key_export(keys, passphrase)?;
// TODO use the progress listener let listener = |progress: usize, total: usize| {
let result = self.runtime.block_on(self.inner.import_keys(keys))?; progress_listener.on_progress(progress as i32, total as i32)
};
let result = self
.runtime
.block_on(self.inner.import_keys(keys, listener))?;
Ok(KeysImportResult { Ok(KeysImportResult {
total: result.1 as i32, total: result.1 as i32,