From e21c8f8038fcf9c2f5e04388c6a2766ef8330658 Mon Sep 17 00:00:00 2001
From: Blatzar <46196380+Blatzar@users.noreply.github.com>
Date: Wed, 23 Nov 2022 15:57:56 +0100
Subject: [PATCH] Fixed DdosGuardKiller, SSL on android 9 and some
 OpenSubtitles fixes

---
 app/build.gradle.kts                                       | 3 ++-
 .../com/lagradost/cloudstream3/network/DdosGuardKiller.kt  | 7 ++++---
 .../com/lagradost/cloudstream3/network/RequestsHelper.kt   | 4 ++++
 .../syncproviders/providers/OpenSubtitlesApi.kt            | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f72eb321..26e7d3a5 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -191,7 +191,8 @@ dependencies {
 //    implementation("com.squareup.okhttp3:okhttp:4.9.2")
 //    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1")
     implementation("com.github.Blatzar:NiceHttp:0.3.5")
-
+    // To fix SSL fuckery on android 9
+    implementation("org.conscrypt:conscrypt-android:2.2.1")
     // Util to skip the URI file fuckery 🙏
     implementation("com.github.tachiyomiorg:unifile:17bec43")
 
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/DdosGuardKiller.kt b/app/src/main/java/com/lagradost/cloudstream3/network/DdosGuardKiller.kt
index dca3ee00..b5783f78 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/DdosGuardKiller.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/DdosGuardKiller.kt
@@ -2,7 +2,7 @@ package com.lagradost.cloudstream3.network
 
 import androidx.annotation.AnyThread
 import com.lagradost.cloudstream3.app
-import com.lagradost.nicehttp.Requests.Companion.await
+import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.cookies
 import kotlinx.coroutines.runBlocking
 import okhttp3.Interceptor
@@ -41,7 +41,8 @@ class DdosGuardKiller(private val alwaysBypass: Boolean) : Interceptor {
             savedCookiesMap[request.url.host]
             // If no cookies are found fetch and save em.
                 ?: (request.url.scheme + "://" + request.url.host + (ddosBypassPath ?: "")).let {
-                    app.get(it, cacheTime = 0).cookies.also { cookies ->
+                    // Somehow app.get fails
+                    Requests().get(it).cookies.also { cookies ->
                         savedCookiesMap[request.url.host] = cookies
                     }
                 }
@@ -51,6 +52,6 @@ class DdosGuardKiller(private val alwaysBypass: Boolean) : Interceptor {
             request.newBuilder()
                 .headers(headers)
                 .build()
-        ).await()
+        ).execute()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
index 8bf1f91b..a1d84f6c 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/network/RequestsHelper.kt
@@ -4,15 +4,19 @@ import android.content.Context
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.R
 import com.lagradost.cloudstream3.USER_AGENT
+import com.lagradost.cloudstream3.mvvm.normalSafeApiCall
 import com.lagradost.nicehttp.Requests
 import com.lagradost.nicehttp.ignoreAllSSLErrors
 import okhttp3.Cache
 import okhttp3.Headers
 import okhttp3.Headers.Companion.toHeaders
 import okhttp3.OkHttpClient
+import org.conscrypt.Conscrypt
 import java.io.File
+import java.security.Security
 
 fun Requests.initClient(context: Context): OkHttpClient {
+    normalSafeApiCall { Security.insertProviderAt(Conscrypt.newProvider(), 1) }
     val settingsManager = PreferenceManager.getDefaultSharedPreferences(context)
     val dns = settingsManager.getInt(context.getString(R.string.dns_pref), 0)
     baseClient = OkHttpClient.Builder()
diff --git a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
index bfa65f62..f22fdd8b 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/syncproviders/providers/OpenSubtitlesApi.kt
@@ -15,6 +15,8 @@ import com.lagradost.cloudstream3.syncproviders.AuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPI
 import com.lagradost.cloudstream3.syncproviders.InAppAuthAPIManager
 import com.lagradost.cloudstream3.utils.AppUtils
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
 
 class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi {
     override val idPrefix = "opensubtitles"
@@ -175,7 +177,7 @@ class OpenSubtitlesApi(index: Int) : InAppAuthAPIManager(index), AbstractSubApi
         val searchQueryUrl = when (imdbId > 0) {
             //Use imdb_id to search if its valid
             true -> "$host/subtitles?imdb_id=$imdbId&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
-            false -> "$host/subtitles?query=$queryText&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
+            false -> "$host/subtitles?query=${URLEncoder.encode(queryText.lowercase(), StandardCharsets.UTF_8.toString())}&languages=${fixedLang}$yearQuery$epQuery$seasonQuery"
         }
 
         val req = app.get(