From 7d67c79d2975dba346e734d3bba79bb1ce9e4e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Wed, 14 Apr 2021 12:14:52 +0200
Subject: [PATCH] crypto: Use the key import progress listener on the rust side

---
 rust-sdk/src/machine.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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