filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects 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

9
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 {
salt += UUID.randomUUID().toString() append(UUID.randomUUID().toString())
} while (salt.length < SALT_LENGTH) } while (length < SALT_LENGTH)
}
return salt.substring(0, SALT_LENGTH) return salt.substring(0, SALT_LENGTH)
} }

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

@ -63,10 +63,8 @@ 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
} }