Merge pull request #430 from matrix-org/feature/fix_restore_blocks_ui

Fix / Restore backup is blocking UI thread
matrix-org · Feb 18, 2019 · d3cd525 · d3cd525
2 parents 2a3e326 + a36542f
commit d3cd525
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/matrix-sdk/src/main/java/org/matrix/androidsdk/crypto/keysbackup/KeysBackup.kt b/matrix-sdk/src/main/java/org/matrix/androidsdk/crypto/keysbackup/KeysBackup.kt
@@ -509,14 +509,16 @@ class KeysBackup(private val mCrypto: MXCrypto, session: MXSession) {
                     return
                 }
 
-                // Compute the recovery key
-                val privateKey = retrievePrivateKeyWithPassword(password,
-                        megolmBackupAuthData.privateKeySalt!!,
-                        megolmBackupAuthData.privateKeyIterations!!)
-
-                val recoveryKey = computeRecoveryKey(privateKey)
+                mCrypto.decryptingThreadHandler.post {
+                    // Compute the recovery key
+                    val privateKey = retrievePrivateKeyWithPassword(password,
+                            megolmBackupAuthData.privateKeySalt!!,
+                            megolmBackupAuthData.privateKeyIterations!!)
+
+                    val recoveryKey = computeRecoveryKey(privateKey)
+                    restoreKeysWithRecoveryKey(version, recoveryKey, roomId, sessionId, callback)
+                }
 
-                restoreKeysWithRecoveryKey(version, recoveryKey, roomId, sessionId, callback)
             }
         })
     }