From d737f048b29d95eb601b37b5c14e7bd2e468e584 Mon Sep 17 00:00:00 2001
From: Horis <821938089@qq.com>
Date: Thu, 22 Jun 2023 23:32:04 +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

---
 .../io/legado/app/help/book/ContentHelp.kt     | 18 +++++++++---------
 .../java/io/legado/app/utils/HtmlFormatter.kt  |  2 +-
 .../io/legado/app/utils/RegexExtensions.kt     |  3 ++-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/book/ContentHelp.kt b/app/src/main/java/io/legado/app/help/book/ContentHelp.kt
index 82aaaa3d3..ed49cb9a2 100644
--- a/app/src/main/java/io/legado/app/help/book/ContentHelp.kt
+++ b/app/src/main/java/io/legado/app/help/book/ContentHelp.kt
@@ -23,8 +23,8 @@ object ContentHelp {
             .replace("[\"”“]+[\\s]*[\"”“][\\s\"”“]*".toRegex(), "”\n“")
             .split("\n(\\s*)".toRegex()).toTypedArray()
 
-        //初始化StringBuffer的长度,在原content的长度基础上做冗余
-        var buffer = StringBuffer((content1.length * 1.15).toInt())
+        //初始化StringBuilder的长度,在原content的长度基础上做冗余
+        var buffer = StringBuilder((content1.length * 1.15).toInt())
         //          章节的文本格式为章节标题-空行-首段，所以处理段落时需要略过第一行文本。
         buffer.append(" ")
         if (chapterName.trim { it <= ' ' } != p[0].trim { it <= ' ' }) {
@@ -52,7 +52,7 @@ object ContentHelp {
                 "$1。\n"
             )
             .split("\n".toRegex()).toTypedArray()
-        buffer = StringBuffer((content1.length * 1.15).toInt())
+        buffer = StringBuilder((content1.length * 1.15).toInt())
         for (s in p) {
             buffer.append("\n")
             buffer.append(findNewLines(s, dict))
@@ -76,7 +76,7 @@ object ContentHelp {
      * @param str
      * @return
      */
-    private fun reduceLength(str: StringBuffer): StringBuffer {
+    private fun reduceLength(str: StringBuilder): StringBuilder {
         val p = str.toString().split("\n".toRegex()).toTypedArray()
         val l = p.size
         val b = BooleanArray(l)
@@ -96,7 +96,7 @@ object ContentHelp {
                 }
             }
         }
-        val string = StringBuffer()
+        val string = StringBuilder()
         for (i in 0 until l) {
             string.append('\n')
             string.append(p[i])
@@ -164,7 +164,7 @@ object ContentHelp {
 
     // 对内容重新划分段落.输入参数str已经使用换行符预分割
     private fun findNewLines(str: String, dict: List<String>): String {
-        val string = StringBuffer(str)
+        val string = StringBuilder(str)
         // 标记string中每个引号的位置.特别的，用引号进行列举时视为只有一对引号。 如：“锅”、“碗”视为“锅、碗”，从而避免误断句。
         val arrayQuote: MutableList<Int> = ArrayList()
         //  标记插入换行符的位置，int为插入位置（str的char下标）
@@ -421,7 +421,7 @@ object ContentHelp {
 //     完成字符串拼接（从string复制、插入引号和换行
 //     ins_quote 在引号前插入一个引号。   ins_quote[i]!=0,则array_quote.get(i)的引号前需要前插入'”'
 //     ins_n 插入换行。数组的值表示插入换行符的位置
-        val buffer = StringBuffer((str.length * 1.15).toInt())
+        val buffer = StringBuilder((str.length * 1.15).toInt())
         var j = 0
         var progress = 0
         var nextLine = -1
@@ -502,8 +502,8 @@ object ContentHelp {
      * @param from    从字符串的第几个字符开始匹配
      * @param to      匹配到第几个字符结束
      * @param inOrder 是否按照从前向后的顺序匹配
-     * @return 返回距离构成的ArrayList<Integer>
-    </Integer> */
+     * @return 返回距离构成的ArrayList<Int>
+     */
     private fun seekIndexs(
         str: String,
         key: String,
diff --git a/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
index 668a79d1f..c36165ca7 100644
--- a/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
+++ b/app/src/main/java/io/legado/app/utils/HtmlFormatter.kt
@@ -41,7 +41,7 @@ object HtmlFormatter {
         //正则的“|”处于顶端而不处于（）中时，具有类似||的熔断效果，故以此机制简化原来的代码
         val matcher = formatImagePattern.matcher(keepImgHtml)
         var appendPos = 0
-        val sb = StringBuffer()
+        val sb = StringBuilder()
         while (matcher.find()) {
             var param = ""
             sb.append(
diff --git a/app/src/main/java/io/legado/app/utils/RegexExtensions.kt b/app/src/main/java/io/legado/app/utils/RegexExtensions.kt
index 7c80837c4..8de851098 100644
--- a/app/src/main/java/io/legado/app/utils/RegexExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/RegexExtensions.kt
@@ -6,6 +6,7 @@ import com.script.rhino.RhinoScriptEngine
 import io.legado.app.exception.RegexTimeoutException
 import io.legado.app.help.CrashHandler
 import io.legado.app.help.coroutine.Coroutine
+import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.suspendCancellableCoroutine
 import splitties.init.appCtx
@@ -23,7 +24,7 @@ fun CharSequence.replace(regex: Regex, replacement: String, timeout: Long): Stri
     val replacement1 = if (isJs) replacement.substring(4) else replacement
     return runBlocking {
         suspendCancellableCoroutine { block ->
-            val coroutine = Coroutine.async {
+            val coroutine = Coroutine.async(executeContext = IO) {
                 try {
                     val pattern = regex.toPattern()
                     val matcher = pattern.matcher(charSequence)