Merge remote-tracking branch 'origin/master'

app/build.gradle

@@ -160,7 +160,7 @@ dependencies {
     implementation('androidx.core:core-ktx:1.10.1')
     implementation('androidx.appcompat:appcompat:1.6.1')
     implementation('androidx.activity:activity-ktx:1.7.2')
-    implementation('androidx.fragment:fragment-ktx:1.5.7')
+    implementation('androidx.fragment:fragment-ktx:1.6.0')
     implementation('androidx.preference:preference-ktx:1.2.0')
     implementation('androidx.constraintlayout:constraintlayout:2.1.4')
     implementation('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0')

app/src/main/assets/cronet.json

@@ -1 +1 @@
-{"x86":"86a6007bc94a30af4bc61789d28a8f00","armeabi-v7a":"309165f6aac13e01023448a22e9495f2","x86_64":"2ff1e1f490daf7ed535c081807661f7d","arm64-v8a":"722ae9a6b64c1643f5b9db41509342e5","version":"114.0.5735.57"}
+{"x86":"46d237d466eddce29196b3f9a71aa23a","armeabi-v7a":"9507ec16a4a3141c4cfd50bec40cdb33","x86_64":"fad87777baadfee3cbc4bd6217519283","arm64-v8a":"68790ba327b8c180e206bd7c61f8254d","version":"114.0.5735.60"}

app/src/main/assets/updateLog.md

@@ -13,6 +13,7 @@
 * 漫画源看书显示乱码，**阅读与其他软件的源并不通用**，请导入阅读的支持的漫画源！
 
 **2023/06/11**
+* 更新cronet: 114.0.5735.60
 
 * 修复长按菜单全文搜索结果不全或无结果问题
 * 优化全文搜索速度

app/src/main/java/io/legado/app/base/adapter/RecyclerAdapter.kt

@@ -161,7 +161,7 @@ abstract class RecyclerAdapter<ITEM, VB : ViewBinding>(protected val context: Co
                     onCurrentListChanged()
                 }
             }
-            handler.postDelayed(1000) {
+            handler.postDelayed(500) {
                 if (diffJob?.isCompleted == false) {
                     diffJob?.cancel()
                     setItems(items)

app/src/main/java/io/legado/app/help/JsExtensions.kt

@@ -727,15 +727,13 @@ interface JsExtensions : JsEncodeUtils {
             var qTTF = CacheManager.getQueryTTF(key)
             if (qTTF != null) return qTTF
             val font: ByteArray? = when {
-                str.isAbsUrl() -> runBlocking {
+                str.isAbsUrl() -> {
                     var x = CacheManager.getByteArray(key)
                     if (x == null) {
                         x = AnalyzeUrl(str, source = getSource()).getByteArray()
-                        x.let {
-                            CacheManager.put(key, it)
-                        }
+                        CacheManager.put(key, x)
                     }
-                    return@runBlocking x
+                    x
                 }
 
                 str.isContentScheme() -> Uri.parse(str).readBytes(appCtx)

app/src/main/java/io/legado/app/help/http/HttpHelper.kt

@@ -71,7 +71,7 @@ val okHttpClient: OkHttpClient by lazy {
         })