From 33f85f50cbb6e9ba08f05b844bf36801f185b276 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 5 Sep 2020 08:03:33 -0500
Subject: [PATCH] Fix hostname verification

---
 app/src/main/java/org/tasks/caldav/CaldavClient.kt   | 6 +++---
 app/src/main/java/org/tasks/etesync/EteSyncClient.kt | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/tasks/caldav/CaldavClient.kt b/app/src/main/java/org/tasks/caldav/CaldavClient.kt
index 30818417b..863a0b291 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavClient.kt
+++ b/app/src/main/java/org/tasks/caldav/CaldavClient.kt
@@ -22,6 +22,7 @@ import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
+import okhttp3.internal.tls.OkHostnameVerifier
 import org.tasks.DebugNetworkInterceptor
 import org.tasks.R
 import org.tasks.Strings.isNullOrEmpty
@@ -42,7 +43,6 @@ import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManager
 
 class CaldavClient {
     private val encryption: KeyStoreEncryption
@@ -84,9 +84,9 @@ class CaldavClient {
         this.interceptor = interceptor
         val customCertManager = CustomCertManager(context)
         customCertManager.appInForeground = foreground
-        val hostnameVerifier = customCertManager.hostnameVerifier(null)
+        val hostnameVerifier = customCertManager.hostnameVerifier(OkHostnameVerifier)
         val sslContext = SSLContext.getInstance("TLS")
-        sslContext.init(null, arrayOf<TrustManager>(customCertManager), null)
+        sslContext.init(null, arrayOf(customCertManager), null)
         basicDigestAuthHandler = BasicDigestAuthHandler(null, username, password)
         val builder = OkHttpClient()
                 .newBuilder()
diff --git a/app/src/main/java/org/tasks/etesync/EteSyncClient.kt b/app/src/main/java/org/tasks/etesync/EteSyncClient.kt
index 5abd44d42..6b2010ed2 100644
--- a/app/src/main/java/org/tasks/etesync/EteSyncClient.kt
+++ b/app/src/main/java/org/tasks/etesync/EteSyncClient.kt
@@ -22,6 +22,7 @@ import kotlinx.coroutines.withContext
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
+import okhttp3.internal.tls.OkHostnameVerifier
 import org.tasks.DebugNetworkInterceptor
 import org.tasks.caldav.MemoryCookieStore
 import org.tasks.data.CaldavAccount
@@ -36,7 +37,6 @@ import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.net.ssl.SSLContext
-import javax.net.ssl.TrustManager
 
 class EteSyncClient {
     private val encryption: KeyStoreEncryption
@@ -89,9 +89,9 @@ class EteSyncClient {
         this.foreground = foreground
         val customCertManager = CustomCertManager(context)
         customCertManager.appInForeground = foreground
-        val hostnameVerifier = customCertManager.hostnameVerifier(null)
+        val hostnameVerifier = customCertManager.hostnameVerifier(OkHostnameVerifier)
         val sslContext = SSLContext.getInstance("TLS")
-        sslContext.init(null, arrayOf<TrustManager>(customCertManager), null)
+        sslContext.init(null, arrayOf(customCertManager), null)
         val builder = OkHttpClient()
                 .newBuilder()
                 .addNetworkInterceptor(TokenAuthenticator(null, token))