Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-15 01:35:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move method to interface step 3

Browse Source
This commit is contained in:
Benoit Marty 2020-03-05 11:24:35 +01:00
parent 1b29c7bf91
commit 36c52d24a7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/crypto/verification/VerificationInfoStart.kt
View File

@ -76,13 +76,17 @@ internal interface VerificationInfoStart : VerificationInfo {
}
private fun isValidSas(): Boolean {
val myHashes = hashes
val myMessageAuthenticationCodes = messageAuthenticationCodes
val myShortAuthenticationStrings = shortAuthenticationStrings
if (keyAgreementProtocols.isNullOrEmpty()
|| hashes.isNullOrEmpty()
|| !hashes.contains("sha256") || messageAuthenticationCodes.isNullOrEmpty()
|| (!messageAuthenticationCodes.contains(SASDefaultVerificationTransaction.SAS_MAC_SHA256)
&& !messageAuthenticationCodes.contains(SASDefaultVerificationTransaction.SAS_MAC_SHA256_LONGKDF))
|| shortAuthenticationStrings.isNullOrEmpty()
|| !shortAuthenticationStrings.contains(SasMode.DECIMAL)) {
|| myHashes.isNullOrEmpty()
|| !myHashes.contains("sha256") || myMessageAuthenticationCodes.isNullOrEmpty()
|| (!myMessageAuthenticationCodes.contains(SASDefaultVerificationTransaction.SAS_MAC_SHA256)
&& !myMessageAuthenticationCodes.contains(SASDefaultVerificationTransaction.SAS_MAC_SHA256_LONGKDF))
|| myShortAuthenticationStrings.isNullOrEmpty()
|| !myShortAuthenticationStrings.contains(SasMode.DECIMAL)) {
return false
}