优化

app/src/main/java/io/legado/app/help/book/ContentProcessor.kt

@@ -146,7 +146,9 @@ class ContentProcessor private constructor(
                 effectiveReplaceRules = arrayListOf()
                 mContent = mContent.lines().joinToString("\n") { it.trim() }
                 getContentReplaceRules().forEach { item ->
-                    if (item.pattern.isNotEmpty()) {
+                    if (item.pattern.isEmpty()) {
+                        return@forEach
+                    }
                     try {
                         val tmp = if (item.isRegex) {
                             mContent.replace(
@@ -173,7 +175,6 @@ class ContentProcessor private constructor(
                 }
             }
         }
-        }
         if (includeTitle) {
             //重新添加标题
             mContent = chapter.getDisplayTitle(

app/src/main/java/io/legado/app/help/storage/Restore.kt

@@ -258,6 +258,7 @@ object Restore {
             if (!BuildConfig.DEBUG) {
                 LauncherIconHelp.changeIcon(appCtx.getPrefString(PreferKey.launcherIcon))
             }
+            ThemeConfig.applyDayNight(appCtx)
             postEvent(EventBus.RECREATE, "")
         }
     }

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

@@ -42,7 +42,8 @@ class PermissionActivity : AppCompatActivity() {
             Request.TYPE_MANAGE_ALL_FILES_ACCESS -> showSettingDialog(permissions, rationale) {
                 try {
                     if (Permissions.isManageExternalStorage()) {
-                        val settingIntent = Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)
+                        val settingIntent =
+                            Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)
                         settingActivityResult.launch(settingIntent)
                     } else {
                         throw NoStackTraceException("no MANAGE_ALL_FILES_ACCESS_PERMISSION")
@@ -53,6 +54,7 @@ class PermissionActivity : AppCompatActivity() {
                     finish()
                 }
             }
+
             Request.TYPE_REQUEST_NOTIFICATIONS -> showSettingDialog(permissions, rationale) {
                 kotlin.runCatching {
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -135,6 +137,10 @@ class PermissionActivity : AppCompatActivity() {
                 )
                 finish()
             }.setOnCancelListener {
+                RequestPlugins.sRequestCallback?.onRequestPermissionsResult(
+                    permissions,
+                    IntArray(0)
+                )
                 finish()
             }
             .show()

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

@@ -1,5 +1,6 @@
 package io.legado.app.lib.permission
 
+import android.annotation.SuppressLint
 import android.content.pm.PackageManager
 import android.os.Build
 import android.os.Environment
@@ -49,6 +50,7 @@ internal class Request : OnRequestPermissionsResultCallback {
         this.rationale = rationale
     }
 
+    @SuppressLint("ObsoleteSdkInt")
     fun start() {
         RequestPlugins.setOnRequestPermissionsCallback(this)