mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-12-20 16:32:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto: Remove the second key export method

Browse source
This commit is contained in:
Damir Jelić 2021-03-30 13:47:30 +02:00
parent 9d5ef01ce0
commit 6af8041fb4
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/DefaultCryptoService.kt
View file

@ -808,24 +808,12 @@ internal class DefaultCryptoService @Inject constructor(
override fun exportRoomKeys(password: String, callback: MatrixCallback<ByteArray>) { override fun exportRoomKeys(password: String, callback: MatrixCallback<ByteArray>) {
cryptoCoroutineScope.launch(coroutineDispatchers.main) { cryptoCoroutineScope.launch(coroutineDispatchers.main) {
runCatching { runCatching {
exportRoomKeys(password, MXMegolmExportEncryption.DEFAULT_ITERATION_COUNT) val iterationCount = max(10000, MXMegolmExportEncryption.DEFAULT_ITERATION_COUNT)
olmMachine!!.exportKeys(password, iterationCount)
}.foldToCallback(callback) }.foldToCallback(callback)
} }
} }
/**
* Export the crypto keys
*
* @param password the password
* @param anIterationCount the encryption iteration count
*/
private suspend fun exportRoomKeys(password: String, anIterationCount: Int): ByteArray {
return withContext(coroutineDispatchers.crypto) {
val iterationCount = max(10000, anIterationCount)
olmMachine!!.exportKeys(password, iterationCount)
}
}
/** /**
* Import the room keys * Import the room keys
* *