From 78d2881b4b730d044350dbb901af48246e0535c9 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Wed, 2 Jun 2021 21:04:51 -0400
Subject: [PATCH] Remove TachiEH Android 7 SSL Workaround, no idea why it was
 used

---
 app/build.gradle.kts                         |  3 --
 app/src/main/java/eu/kanade/tachiyomi/App.kt | 47 +++++---------------
 2 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index dc9283978..c81d2fe19 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -274,9 +274,6 @@ dependencies {
     // debugImplementation("com.squareup.leakcanary:leakcanary-android:2.7")
 
     // SY -->
-    // [EXH] Android 7 SSL Workaround
-    implementation("com.google.android.gms:play-services-safetynet:17.0.0")
-
     // Changelog
     implementation("com.github.gabrielemariotti.changeloglib:changelog:2.1.0")
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt
index 6220b3679..31b16e5d0 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/App.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt
@@ -32,9 +32,6 @@ import com.elvishew.xlog.printer.Printer
 import com.elvishew.xlog.printer.file.backup.NeverBackupStrategy
 import com.elvishew.xlog.printer.file.clean.FileLastModifiedCleanStrategy
 import com.elvishew.xlog.printer.file.naming.DateFileNameGenerator
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException
-import com.google.android.gms.common.GooglePlayServicesRepairableException
-import com.google.android.gms.security.ProviderInstaller
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.ktx.Firebase
 import com.ms_square.debugoverlay.DebugOverlay
@@ -66,11 +63,9 @@ import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 import uy.kohesive.injekt.injectLazy
 import java.io.File
-import java.security.NoSuchAlgorithmException
 import java.security.Security
 import java.text.SimpleDateFormat
 import java.util.Locale
-import javax.net.ssl.SSLContext
 
 open class App : Application(), LifecycleObserver, ImageLoaderFactory {
 
@@ -85,8 +80,6 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
         Timber.plant(XLogTree()) // SY Redirect Timber to XLog
         if (!BuildConfig.DEBUG) addAnalytics()
 
-        workaroundAndroid7BrokenSSL()
-
         // TLS 1.3 support for Android < 10
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
             Security.insertProviderAt(Conscrypt.newProvider(), 1)
@@ -166,26 +159,6 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
         }.build()
     }
 
-    private fun workaroundAndroid7BrokenSSL() {
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.N ||
-            Build.VERSION.SDK_INT == Build.VERSION_CODES.N_MR1
-        ) {
-            try {
-                SSLContext.getInstance("TLSv1.2")
-            } catch (e: NoSuchAlgorithmException) {
-                xLogE("Could not install Android 7 broken SSL workaround!", e)
-            }
-
-            try {
-                ProviderInstaller.installIfNeeded(applicationContext)
-            } catch (e: GooglePlayServicesRepairableException) {
-                xLogE("Could not install Android 7 broken SSL workaround!", e)
-            } catch (e: GooglePlayServicesNotAvailableException) {
-                xLogE("Could not install Android 7 broken SSL workaround!", e)
-            }
-        }
-    }
-
     private fun addAnalytics() {
         if (syDebugVersion != "0") {
             Firebase.analytics.setUserProperty("preview_version", syDebugVersion)
@@ -259,15 +232,17 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
 
         xLogD("Application booting...")
         xLogD(
-            "App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE})\n" +
-                "Preview build: $syDebugVersion\n" +
-                "Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}) \n" +
-                "Android build ID: ${Build.DISPLAY}\n" +
-                "Device brand: ${Build.BRAND}\n" +
-                "Device manufacturer: ${Build.MANUFACTURER}\n" +
-                "Device name: ${Build.DEVICE}\n" +
-                "Device model: ${Build.MODEL}\n" +
-                "Device product name: ${Build.PRODUCT}"
+            """
+                App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE})
+                Preview build: $syDebugVersion
+                Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}) 
+                Android build ID: ${Build.DISPLAY}
+                Device brand: ${Build.BRAND}
+                Device manufacturer: ${Build.MANUFACTURER}
+                Device name: ${Build.DEVICE}
+                Device model: ${Build.MODEL}
+                Device product name: ${Build.PRODUCT}
+            """.trimIndent()
         )
     }