6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Merge pull request #417 from Dominaezzz/kt-opt 

Some optimisations
This commit is contained in:
Benoit Marty 2019-08-06 11:42:07 +02:00 committed by GitHub
parent c2e053b62b a34b053efe
commit ed6d28bd3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/keysbackup/KeysBackupPassword.kt
View File

@ -142,12 +142,11 @@ private fun deriveKey(password: String,
* Generate a 32 chars salt
*/
private fun generateSalt(): String {
var salt = ""

do {
salt += UUID.randomUUID().toString()
} while (salt.length < SALT_LENGTH)

val salt = buildString {
do {
append(UUID.randomUUID().toString())
} while (length < SALT_LENGTH)
}

return salt.substring(0, SALT_LENGTH)
}

4
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/model/MXKey.kt
View File

@ -63,9 +63,7 @@ data class MXKey(
fun signatureForUserId(userId: String, signkey: String): String? {
// sanity checks
if (userId.isNotBlank() && signkey.isNotBlank()) {
if (signatures.containsKey(userId)) {
return signatures[userId]?.get(signkey)
}
return signatures[userId]?.get(signkey)
}

return null