ImportKeys/ExportKeys separate dialog componants

2019-09-09 14:42:58 -04:00
parent 15add6d91c
commit 7c0bed79a9
9 changed files with 109 additions and 98 deletions
--- a/src/python/matrix_client.py
+++ b/src/python/matrix_client.py
@@ -324,13 +324,15 @@ class MatrixClient(nio.AsyncClient):
        account     = self.models[Account][self.user_id]
        import_keys = partial(self.olm.import_keys_static, infile, passphrase)

+        account.importing_key        = 0
+        account.total_keys_to_import = -1  # preparing
+
        try:
            sessions = await loop.run_in_executor(None, import_keys)
        except nio.EncryptionError as err:
            account.import_error = (infile, passphrase, str(err))
            return

-        account.importing_key        = 0
        account.total_keys_to_import = len(sessions)

        for session in sessions: