From 870551a67c09e7fccecc6a840b3404f3c011d710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?=
 <41315874+fumiama@users.noreply.github.com>
Date: Mon, 30 Oct 2023 22:13:22 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=9D=E5=AD=98=E5=B0=81=E9=9D=A2?=
 =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=AF=BC=E8=87=B4=E7=9A=84=E9=97=AA=E9=80=80?=
 =?UTF-8?q?=20=E9=A1=BA=E4=BE=BF=E6=9B=B4=E6=96=B0=20targetSdkVersion=20?=
 =?UTF-8?q?=E5=88=B0=2034?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                       |  2 +-
 .../java/top/fumiama/copymanga/ui/book/BookHandler.kt  | 10 +++++-----
 app/src/main/res/values/strings.xml                    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3942c99..1fd51de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         compileSdk 34
         applicationId 'top.fumiama.copymanga'
         minSdkVersion 23
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 37
         versionName '2.0.1'
         resConfigs 'zh', 'zh-rCN'
diff --git a/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt b/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt
index 7df0ee1..cf3b38d 100644
--- a/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt
+++ b/app/src/main/java/top/fumiama/copymanga/ui/book/BookHandler.kt
@@ -80,7 +80,7 @@ class BookHandler(private val th: WeakReference<BookFragment>, val path: String)
     override fun onError() {
         super.onError()
         if(exit) return
-        if(!hasToastedError) {
+        if(!hasToastedError) that?.activity?.runOnUiThread {
             Toast.makeText(that?.context, R.string.null_book, Toast.LENGTH_SHORT).show()
             that?.apply { findNavController().popBackStack() }
         }
@@ -318,9 +318,9 @@ class BookHandler(private val th: WeakReference<BookFragment>, val path: String)
             val times = counts[i] / 100
             val remain = counts[i] % 100
             val re = arrayOfNulls<VolumeStructure>(if(remain != 0) (times+1) else (times))
-            if (re.isEmpty()) {
+            if (re.isEmpty()) that?.activity?.runOnUiThread {
                 Toast.makeText(that?.context, "获取${gpw}失败", Toast.LENGTH_SHORT).show()
-                return@forEachIndexed
+                return@runOnUiThread
             }
             Log.d("MyBFH", "${i}卷共${if(times == 0) 1 else times}次加载")
             do {
@@ -393,8 +393,8 @@ class BookHandler(private val th: WeakReference<BookFragment>, val path: String)
                                 imic.drawable.toBitmap().compress(Bitmap.CompressFormat.JPEG, 90, fo)
                             } catch (e: Exception) {
                                 e.printStackTrace()
-                                mainWeakReference?.get()?.apply {
-                                    Toast.makeText(this, R.string.download_cover_error, Toast.LENGTH_SHORT).show()
+                                that?.activity?.runOnUiThread {
+                                    Toast.makeText(that?.context, R.string.download_cover_timeout, Toast.LENGTH_SHORT).show()
                                 }
                             }
                             fo.close()
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 46db98e..3d2c33a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@
     <string name="text_null">N/A</string>
     <string name="null_book">获取图书信息失败</string>
     <string name="web_error">网络错误</string>
-    <string name="download_cover_error">保存封面出错</string>
+    <string name="download_cover_timeout">保存封面超时</string>
 
     <string name="mainPageApiUrl">https://%1$s/api/v3/h5/homeIndex?platform=3</string>
     <string name="referUrl">https://%1$s</string>