From 9fac012d11b4c9fcae60bbff215e87f86a5bc534 Mon Sep 17 00:00:00 2001
From: AllenTom <qweasdzxczse2@gmail.com>
Date: Sun, 24 Nov 2024 19:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4https=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=BF=BD=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/aiosman/ravenow/data/api/ApiClient.kt | 25 -------------------
 .../ravenow/ui/composables/PolicyCheckbox.kt  | 13 ----------
 2 files changed, 38 deletions(-)

diff --git a/app/src/main/java/com/aiosman/ravenow/data/api/ApiClient.kt b/app/src/main/java/com/aiosman/ravenow/data/api/ApiClient.kt
index b7daf16..182eb3f 100644
--- a/app/src/main/java/com/aiosman/ravenow/data/api/ApiClient.kt
+++ b/app/src/main/java/com/aiosman/ravenow/data/api/ApiClient.kt
@@ -23,32 +23,7 @@ fun getUnsafeOkHttpClient(
 ): OkHttpClient {
     return try {
         // Create a trust manager that does not validate certificate chains
-        val trustAllCerts = arrayOf<TrustManager>(object : X509TrustManager {
-            @Throws(CertificateException::class)
-            override fun checkClientTrusted(
-                chain: Array<java.security.cert.X509Certificate>,
-                authType: String
-            ) {
-            }
-
-            @Throws(CertificateException::class)
-            override fun checkServerTrusted(
-                chain: Array<java.security.cert.X509Certificate>,
-                authType: String
-            ) {
-            }
-
-            override fun getAcceptedIssuers(): Array<java.security.cert.X509Certificate> = arrayOf()
-        })
-
-        // Install the all-trusting trust manager
-        val sslContext = SSLContext.getInstance("SSL")
-        sslContext.init(null, trustAllCerts, java.security.SecureRandom())
-        // Create an ssl socket factory with our all-trusting manager
-        val sslSocketFactory = sslContext.socketFactory
-
         OkHttpClient.Builder()
-            .sslSocketFactory(sslSocketFactory, trustAllCerts[0] as X509TrustManager)
             .hostnameVerifier { _, _ -> true }
             .apply {
                 authInterceptor?.let {
diff --git a/app/src/main/java/com/aiosman/ravenow/ui/composables/PolicyCheckbox.kt b/app/src/main/java/com/aiosman/ravenow/ui/composables/PolicyCheckbox.kt
index 5e64352..7ffc4c9 100644
--- a/app/src/main/java/com/aiosman/ravenow/ui/composables/PolicyCheckbox.kt
+++ b/app/src/main/java/com/aiosman/ravenow/ui/composables/PolicyCheckbox.kt
@@ -129,19 +129,6 @@ fun WebViewDisplay(modifier: Modifier = Modifier, url: String) {
             AndroidView(
                 factory = { context ->
                     WebView(context).apply {
-                        webViewClient = object : WebViewClient() {
-                            override fun onReceivedSslError(
-                                view: WebView?,
-                                handler: SslErrorHandler?,
-                                error: SslError?
-                            ) {
-                                handler?.proceed() // 忽略证书错误
-                            }
-                        }
-                        settings.apply {
-                            domStorageEnabled = true
-                            mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
-                        }
                         loadUrl(url)
                     }
                 },