mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 05:31:21 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #417 from Dominaezzz/kt-opt

Browse source 
Some optimisations
This commit is contained in:
Benoit Marty 2019-08-06 11:42:07 +02:00 committed by GitHub
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 * Generate a 32 chars salt
*/ */
private fun generateSalt(): String { private fun generateSalt(): String {
var salt = "" val salt = buildString {
do {
do { append(UUID.randomUUID().toString())
salt += UUID.randomUUID().toString() } while (length < SALT_LENGTH)
} while (salt.length < SALT_LENGTH) }
return salt.substring(0, 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? { fun signatureForUserId(userId: String, signkey: String): String? {
// sanity checks // sanity checks
if (userId.isNotBlank() && signkey.isNotBlank()) { if (userId.isNotBlank() && signkey.isNotBlank()) {
if (signatures.containsKey(userId)) { return signatures[userId]?.get(signkey)
return signatures[userId]?.get(signkey)
}
} }
return null return null