mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-14 03:59:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

Chunk key import to avoid ram allocation peak

Browse source
This commit is contained in:
Valere 2021-11-26 11:47:16 +01:00
parent 0e44e32d2a
commit 1635c9730a
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
View file

@ -75,13 +75,9 @@ class CryptoLogger : Logger {
}
}
private class CryptoProgressListener(listener: ProgressListener?) : RustProgressListener {
private val inner: ProgressListener? = listener
private class CryptoProgressListener(private val listener: ProgressListener?) : RustProgressListener {
override fun onProgress(progress: Int, total: Int) {
if (this.inner != null) {
this.inner.onProgress(progress, total)
}
listener?.onProgress(progress, total)
}
}
@ -524,14 +520,29 @@ internal class OlmMachine(
listener: ProgressListener?
): ImportRoomKeysResult =
withContext(Dispatchers.IO) {
val adapter = MoshiProvider.providesMoshi().adapter(List::class.java)
val encodedKeys = adapter.toJson(keys)
val rustListener = CryptoProgressListener(listener)
// If the key backup is too big we take the risk of causing OOM
// so let's chunk to avoid it
var totalImported = 0L
var accTotal = 0L
keys.chunked(500)
.forEach { keysSlice ->
val encodedKeys = adapter.toJson(keysSlice)
val rustListener = object : RustProgressListener {
override fun onProgress(progress: Int, total: Int) {
val accProgress = (accTotal + progress).toInt()
listener?.onProgress(accProgress, keys.size)
}
}
val result = inner.importDecryptedKeys(encodedKeys, rustListener)
ImportRoomKeysResult(result.total.toInt(), result.imported.toInt())
inner.importDecryptedKeys(encodedKeys, rustListener).let {
totalImported += it.imported
accTotal += it.total
}
}
ImportRoomKeysResult(totalImported.toInt(), accTotal.toInt())
}
@Throws(CryptoStoreException::class)