filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code review fixes.

Browse Source
This commit is contained in:
Onuray Sahin 2021-10-25 12:17:32 +03:00 committed by Valere
parent 4ac90f10c1
commit c603135398
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3473.bugfix Normal file
View File

@ -0,0 +1 @@
MSC2732: Olm fallback keys

8
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OneTimeKeysUploader.kt
View File

@ -124,15 +124,15 @@ internal class OneTimeKeysUploader @Inject constructor(
* @param keyLimit the limit * @param keyLimit the limit
* @return the number of uploaded keys * @return the number of uploaded keys
*/ */
private suspend fun uploadOTK(keyCount: Int, keyLimit: Int, shouldGenerateFallbackKey: Boolean): Int { private suspend fun uploadOTK(keyCount: Int, keyLimit: Int, shouldUploadFallbackKey: Boolean): Int {
if (keyLimit <= keyCount && !shouldGenerateFallbackKey) { if (keyLimit <= keyCount && !shouldUploadFallbackKey) {
// If we don't need to generate any more keys then we are done. // If we don't need to generate any more keys then we are done.
return 0 return 0
} }
val keysThisLoop = min(keyLimit - keyCount, ONE_TIME_KEY_GENERATION_MAX_NUMBER) val keysThisLoop = min(keyLimit - keyCount, ONE_TIME_KEY_GENERATION_MAX_NUMBER)
olmDevice.generateOneTimeKeys(keysThisLoop) olmDevice.generateOneTimeKeys(keysThisLoop)
val fallbackKey = if (shouldGenerateFallbackKey) olmDevice.getFallbackKey() else null val fallbackKey = if (shouldUploadFallbackKey) olmDevice.getFallbackKey() else null
val response = uploadOneTimeKeys(olmDevice.getOneTimeKeys(), fallbackKey) val response = uploadOneTimeKeys(olmDevice.getOneTimeKeys(), fallbackKey)
olmDevice.markKeysAsPublished() olmDevice.markKeysAsPublished()
@ -183,7 +183,7 @@ internal class OneTimeKeysUploader @Inject constructor(
val uploadParams = UploadKeysTask.Params( val uploadParams = UploadKeysTask.Params(
deviceKeys = null, deviceKeys = null,
oneTimeKeys = oneTimeJson, oneTimeKeys = oneTimeJson,
fallbackKeys = if (fallbackJson.isNotEmpty()) fallbackJson else null fallbackKeys = fallbackJson.takeIf { fallbackJson.isNotEmpty() }
) )
return uploadKeysTask.execute(uploadParams) return uploadKeysTask.execute(uploadParams)
} }