优化

app/build.gradle

@@ -179,8 +179,6 @@ dependencies {
 
     //网络
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
-    implementation 'com.ljx.rxhttp:rxhttp:2.5.7'
-    kapt 'com.ljx.rxhttp:rxhttp-compiler:2.5.7'
 
     //Glide
     implementation 'com.github.bumptech.glide:glide:4.11.0'

app/src/main/java/io/legado/app/App.kt

@@ -7,7 +7,6 @@ import android.content.res.Configuration
 import android.os.Build
 import androidx.multidex.MultiDexApplication
 import com.jeremyliao.liveeventbus.LiveEventBus
-import io.legado.app.constant.AppConst
 import io.legado.app.constant.AppConst.channelIdDownload
 import io.legado.app.constant.AppConst.channelIdReadAloud
 import io.legado.app.constant.AppConst.channelIdWeb
@@ -15,10 +14,8 @@ import io.legado.app.help.ActivityHelp
 import io.legado.app.help.AppConfig
 import io.legado.app.help.CrashHandler
 import io.legado.app.help.ThemeConfig.applyDayNight
-import io.legado.app.help.http.okHttpClient
 import io.legado.app.utils.LanguageUtils
 import io.legado.app.utils.defaultSharedPreferences
-import rxhttp.wrapper.param.RxHttp
 
 class App : MultiDexApplication() {
 
@@ -26,10 +23,6 @@ class App : MultiDexApplication() {
         super.onCreate()
         CrashHandler(this)
         LanguageUtils.setConfiguration(this)
-        RxHttp.init(okHttpClient, BuildConfig.DEBUG)
-        RxHttp.setOnParamAssembly {
-            it.addHeader(AppConst.UA_NAME, AppConfig.userAgent)
-        }
         createNotificationChannels()
         applyDayNight(this)
         LiveEventBus.config()

app/src/main/java/io/legado/app/help/http/parser/ByteParser.kt

@@ -1,13 +0,0 @@
-package io.legado.app.help.http.parser
-
-import okhttp3.Response
-import rxhttp.wrapper.annotation.Parser
-
-@Parser(name = "ByteArray")
-class ByteParser : rxhttp.wrapper.parse.Parser<ByteArray> {
-
-    override fun onParse(response: Response): ByteArray {
-        return response.body!!.bytes()
-    }
-
-}

app/src/main/java/io/legado/app/help/http/parser/InputStreamParser.kt

@@ -1,14 +0,0 @@
-package io.legado.app.help.http.parser
-
-import okhttp3.Response
-import rxhttp.wrapper.annotation.Parser
-import java.io.InputStream
-
-@Parser(name = "InputStream")
-class InputStreamParser : rxhttp.wrapper.parse.Parser<InputStream> {
-
-    override fun onParse(response: Response): InputStream {
-        return response.body!!.byteStream()
-    }
-
-}

app/src/main/java/io/legado/app/help/http/parser/StrResponseParser.kt

@@ -1,19 +0,0 @@
-package io.legado.app.help.http.parser
-
-import io.legado.app.help.http.StrResponse
-import io.legado.app.help.http.text
-import okhttp3.Response
-import rxhttp.wrapper.annotation.Parser
-import rxhttp.wrapper.exception.HttpStatusCodeException
-
-@Parser(name = "StrResponse")
-class StrResponseParser(private val encode: String? = null) :
-    rxhttp.wrapper.parse.Parser<StrResponse> {
-
-    override fun onParse(response: Response): StrResponse {
-        val body = response.body?.text(encode)
-            ?: throw HttpStatusCodeException(response, "内容为空")
-        return StrResponse(response, body)
-    }
-
-}

app/src/main/java/io/legado/app/help/http/parser/TextParser.kt

@@ -1,17 +0,0 @@
-package io.legado.app.help.http.parser
-
-import io.legado.app.help.http.text
-import okhttp3.Response
-import rxhttp.wrapper.annotation.Parser
-import rxhttp.wrapper.exception.HttpStatusCodeException
-
-@Parser(name = "Text")
-class TextParser(private val encode: String? = null) : rxhttp.wrapper.parse.Parser<String> {
-
-    override fun onParse(response: Response): String {
-
-        val responseBody = response.body ?: throw HttpStatusCodeException(response, "内容为空")
-        return responseBody.text(encode)
-    }
-
-}

app/src/main/java/io/legado/app/lib/permission/PermissionsCompat.kt

@@ -29,11 +29,6 @@ class PermissionsCompat private constructor() {
             return this
         }
 
-        fun requestCode(requestCode: Int): Builder {
-            request.setRequestCode(requestCode)
-            return this
-        }
-
         fun onGranted(callback: () -> Unit): Builder {
             request.setOnGrantedCallback(object : OnPermissionsGrantedCallback {
                 override fun onPermissionsGranted() {

app/src/main/java/io/legado/app/lib/permission/Request.kt

@@ -46,10 +46,6 @@ internal class Request : OnRequestPermissionsResultCallback {
         this.permissions?.addAll(listOf(*permissions))
     }
 
-    fun setRequestCode(requestCode: Int) {
-        this.requestCode = requestCode
-    }
-
     fun setOnGrantedCallback(callback: OnPermissionsGrantedCallback) {
         grantedCallback = callback
     }
@@ -81,13 +77,10 @@ internal class Request : OnRequestPermissionsResultCallback {
                     if (rationaleResId != 0) source?.context?.getText(rationaleResId) else rationale
                 if (rationale != null) {
                     showSettingDialog(rationale) {
-                        onPermissionsDenied(
+                        onPermissionsDenied(deniedPermissions)
-                            requestCode,
-                            deniedPermissions
-                        )
                     }
                 } else {
-                    onPermissionsDenied(requestCode, deniedPermissions)
+                    onPermissionsDenied(deniedPermissions)
                 }
             }
         } else {
@@ -160,7 +153,7 @@ internal class Request : OnRequestPermissionsResultCallback {
         RequestPlugins.sResultCallback?.onPermissionsGranted()
     }
 
-    private fun onPermissionsDenied(requestCode: Int, deniedPermissions: Array<String>) {
+    private fun onPermissionsDenied(deniedPermissions: Array<String>) {
         try {
             deniedCallback?.onPermissionsDenied(deniedPermissions)
         } catch (ignore: Exception) {
@@ -178,9 +171,9 @@ internal class Request : OnRequestPermissionsResultCallback {
             val rationale =
                 if (rationaleResId != 0) source?.context?.getText(rationaleResId) else rationale
             if (rationale != null) {
-                showSettingDialog(rationale) { onPermissionsDenied(requestCode, deniedPermissions) }
+                showSettingDialog(rationale) { onPermissionsDenied(deniedPermissions) }
             } else {
-                onPermissionsDenied(requestCode, deniedPermissions)
+                onPermissionsDenied(deniedPermissions)
             }
         } else {
             onPermissionsGranted()
@@ -192,7 +185,7 @@ internal class Request : OnRequestPermissionsResultCallback {
         if (deniedPermissions == null) {
             onPermissionsGranted()
         } else {
-            onPermissionsDenied(this.requestCode, deniedPermissions)
+            onPermissionsDenied(deniedPermissions)
         }
     }
 

app/src/main/java/io/legado/app/model/webBook/BookContent.kt

@@ -15,6 +15,7 @@ import io.legado.app.utils.NetworkUtils
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.async
+import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext
 import splitties.init.appCtx
 
@@ -47,11 +48,11 @@ object BookContent {
         val analyzeRule = AnalyzeRule(book).setContent(body, baseUrl)
         analyzeRule.setRedirectUrl(baseUrl)
         analyzeRule.nextChapterUrl = mNextChapterUrl
+        scope.ensureActive()
         var contentData = analyzeContent(
             book, baseUrl, redirectUrl, body, contentRule, bookChapter, bookSource, mNextChapterUrl
         )
         content.append(contentData.content).append("\n")
-
         if (contentData.nextUrl.size == 1) {
             var nextUrl = contentData.nextUrl[0]
             while (nextUrl.isNotEmpty() && !nextUrlList.contains(nextUrl)) {
@@ -60,6 +61,7 @@ object BookContent {
                     == NetworkUtils.getAbsoluteURL(baseUrl, mNextChapterUrl)
                 ) break
                 nextUrlList.add(nextUrl)
+                scope.ensureActive()
                 val res = AnalyzeUrl(
                     ruleUrl = nextUrl,
                     book = book,
@@ -95,6 +97,7 @@ object BookContent {
                     }
                 }
                 asyncArray.forEach { coroutine ->
+                    scope.ensureActive()
                     content.append(coroutine.await()).append("\n")
                 }
             }