From 2ee0e5ee4229799173c71dcae60a87ea23a54334 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 7 Jun 2020 15:47:42 -0400
Subject: [PATCH] TLS 1.3 support for Android < 10

Should fix https://github.com/inorichi/tachiyomi-extensions/issues/3233

(cherry picked from commit 31015504f4d0df3d0a4b185fb754f1224dfe1c0c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/App.kt
---
 app/build.gradle                             | 3 +++
 app/src/main/java/eu/kanade/tachiyomi/App.kt | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index f6c83ef02..611111bb8 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -175,6 +175,9 @@ dependencies {
     implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
     implementation 'com.squareup.okio:okio:2.6.0'
 
+    // TLS 1.3 support for Android < 10
+    implementation 'org.conscrypt:conscrypt-android:2.4.0'
+
     // REST
     final retrofit_version = '2.9.0'
     implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
index e19610e76..266cb6c5b 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -42,10 +42,12 @@ import io.realm.Realm
 import io.realm.RealmConfiguration
 import java.io.File
 import java.security.NoSuchAlgorithmException
+import java.security.Security
 import javax.net.ssl.SSLContext
 import kotlin.concurrent.thread
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
+import org.conscrypt.Conscrypt
 import timber.log.Timber
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.InjektScope
@@ -67,6 +69,11 @@ open class App : Application(), LifecycleObserver {
             ForceCloseActivity.closeApp(this)
         }
 
+        // TLS 1.3 support for Android 10 and below
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+            Security.insertProviderAt(Conscrypt.newProvider(), 1)
+        }
+
         Injekt = InjektScope(DefaultRegistrar())
         Injekt.importModule(AppModule(this))