mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-18 13:00:18 +03:00
Code Issues Projects Releases Packages Wiki Activity

Kotlin style

Browse source
This commit is contained in:
Benoit Marty 2020-07-01 12:11:45 +02:00
parent b8b79de91c
commit 057f6fdf26
2 changed files with 2 additions and 19 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/network/ssl/PinnedTrustManager.kt
View file

@ -72,16 +72,7 @@ internal class PinnedTrustManager(private val fingerprints: List<Fingerprint>,
private fun checkTrusted(chain: Array<X509Certificate>) { private fun checkTrusted(chain: Array<X509Certificate>) {
val cert = chain[0] val cert = chain[0]
var found = false if (!fingerprints.any { it.matchesCert(cert) }) {
for (allowedFingerprint in fingerprints) {
if (allowedFingerprint.matchesCert(cert)) {
found = true
break
}
}
if (!found) {
throw UnrecognizedCertificateException(cert, Fingerprint.newSha256Fingerprint(cert), null) throw UnrecognizedCertificateException(cert, Fingerprint.newSha256Fingerprint(cert), null)
} }
} }

10
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/network/ssl/PinnedTrustManagerApi24.kt
View file

@ -144,15 +144,7 @@ internal class PinnedTrustManagerApi24(private val fingerprints: List<Fingerprin
private fun checkTrusted(chain: Array<X509Certificate>) { private fun checkTrusted(chain: Array<X509Certificate>) {
val cert = chain[0] val cert = chain[0]
var found = false if (!fingerprints.any { it.matchesCert(cert) }) {
for (allowedFingerprint in fingerprints) {
if (allowedFingerprint.matchesCert(cert)) {
found = true
break
}
}
if (!found) {
throw UnrecognizedCertificateException(cert, Fingerprint.newSha256Fingerprint(cert), null) throw UnrecognizedCertificateException(cert, Fingerprint.newSha256Fingerprint(cert), null)
} }
} }