AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Simplify TrustManager assignment

Browse Source
This commit is contained in:
Julian Raufelder 2021-11-04 15:42:28 +01:00
parent 6af9704865
commit b163353c1e
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/src/main/java/org/cryptomator/data/cloud/webdav/network/WebDavCompatibleHttpClient.kt
View File

@ -22,7 +22,6 @@ import java.io.IOException
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import javax.net.ssl.X509TrustManager
import okhttp3.Authenticator import okhttp3.Authenticator
import okhttp3.Cache import okhttp3.Cache
import okhttp3.CacheControl import okhttp3.CacheControl
@ -69,16 +68,15 @@ internal class WebDavCompatibleHttpClient(cloud: WebDavCloud, context: Context)
.addInterceptor(provideOfflineCacheInterceptor(context)) .addInterceptor(provideOfflineCacheInterceptor(context))
} }
val trustManager: X509TrustManager val trustManager = if (usingWebDavWithSelfSignedCertificate(webDavCloud)) {
if (usingWebDavWithSelfSignedCertificate(webDavCloud)) {
val pinningTrustManager = PinningTrustManager(webDavCloud.certificate()) val pinningTrustManager = PinningTrustManager(webDavCloud.certificate())
trustManager = pinningTrustManager
builder.hostnameVerifier(pinningTrustManager.hostnameVerifier()) builder.hostnameVerifier(pinningTrustManager.hostnameVerifier())
pinningTrustManager
} else { } else {
trustManager = DefaultTrustManager() DefaultTrustManager()
} }
builder.sslSocketFactory(SSLSocketFactories.from(trustManager), trustManager) builder.sslSocketFactory(SSLSocketFactories.from(trustManager), trustManager)
return builder.build() return builder.build()
} }