From bf8ea4bea37c66241f937c8fbed222dfaead74b1 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Tue, 8 Apr 2025 15:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/proguard-rules.pro                          |  7 +------
 .../main/java/io/legado/app/help/http/Cronet.kt |  8 ++------
 .../main/java/io/legado/app/utils/IntentType.kt | 17 +----------------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 0a8616c0a..836a7ecb1 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -166,12 +166,7 @@ cn.hutool.core.util.**{*;}
     *** sTestTrustManager;
 }
 
-# Class.forName调用
--keep class io.legado.app.lib.cronet.CronetInterceptor{*;}
--keep class io.legado.app.lib.cronet.CronetLoader{*;}
--keep class io.legado.app.help.update.AppUpdateGitHub{*;}
--keep class io.legado.app.help.AppIntentType{*;}
-# Error Exception 
+# Error Exception
 -keepnames class * extends java.lang.Exception
 -keepnames class * extends java.lang.Error
 -keepnames class **Exception
diff --git a/app/src/main/java/io/legado/app/help/http/Cronet.kt b/app/src/main/java/io/legado/app/help/http/Cronet.kt
index d5587ce12..36d8e3fcd 100644
--- a/app/src/main/java/io/legado/app/help/http/Cronet.kt
+++ b/app/src/main/java/io/legado/app/help/http/Cronet.kt
@@ -1,7 +1,7 @@
 package io.legado.app.help.http
 
+import io.legado.app.lib.cronet.CronetInterceptor
 import io.legado.app.lib.cronet.CronetLoader
-import okhttp3.CookieJar
 import okhttp3.Interceptor
 
 object Cronet {
@@ -15,11 +15,7 @@ object Cronet {
     }
 
     val interceptor: Interceptor? by lazy {
-        kotlin.runCatching {
-            val iClass = Class.forName("io.legado.app.lib.cronet.CronetInterceptor")
-            iClass.getDeclaredConstructor(CookieJar::class.java)
-                .newInstance(cookieJar) as Interceptor
-        }.getOrNull()
+        CronetInterceptor(cookieJar)
     }
 
     interface LoaderInterface {
diff --git a/app/src/main/java/io/legado/app/utils/IntentType.kt b/app/src/main/java/io/legado/app/utils/IntentType.kt
index d5628c265..90385292d 100644
--- a/app/src/main/java/io/legado/app/utils/IntentType.kt
+++ b/app/src/main/java/io/legado/app/utils/IntentType.kt
@@ -1,10 +1,8 @@
 package io.legado.app.utils
 
 import android.net.Uri
-import androidx.annotation.Keep
 import java.io.File
 
-@Keep
 object IntentType {
 
     fun from(uri: Uri): String {
@@ -26,21 +24,8 @@ object IntentType {
             "jpg", "gif", "png", "jpeg", "bmp" -> "image/*"
             "", "txt", "json", "log" -> "text/plain"
             "apk" -> "application/vnd.android.package-archive"
-            else -> appIntentType?.from(path) ?: "*/*"
+            else -> "*/*"
         }
     }
 
-    private val appIntentType: TypeInterface? by lazy {
-        kotlin.runCatching {
-            Class.forName("io.legado.app.help.AppIntentType")
-                .kotlin.objectInstance as? TypeInterface
-        }.getOrNull()
-    }
-
-    interface TypeInterface {
-
-        fun from(path: String?): String?
-
-    }
-
 }
\ No newline at end of file