From 090227d06386e44ef3672f394044c3f2dc09d46b Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Sun, 8 Aug 2021 15:24:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/ui/book/cache/CacheViewModel.kt    | 4 +++-
 app/src/main/res/layout/item_download.xml                 | 8 ++++++++
 .../src/main/java/me/ag2s/epublib/util/ResourceUtil.java  | 6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt
index 8e6019c1c..4965fa0b7 100644
--- a/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheViewModel.kt
@@ -33,7 +33,7 @@ import javax.script.SimpleBindings
 
 class CacheViewModel(application: Application) : BaseViewModel(application) {
 
-    fun getExportFileName(book: Book): String {
+    private fun getExportFileName(book: Book): String {
         val jsStr = AppConfig.bookExportFileName
         if (jsStr.isNullOrBlank()) {
             return "${book.name} 作者：${book.getRealAuthor()}"
@@ -56,6 +56,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
             }
         }.onError {
             finally(it.localizedMessage ?: "ERROR")
+            it.printStackTrace()
         }.onSuccess {
             finally(context.getString(R.string.success))
         }
@@ -185,6 +186,7 @@ class CacheViewModel(application: Application) : BaseViewModel(application) {
             }
         }.onError {
             finally(it.localizedMessage ?: "ERROR")
+            it.printStackTrace()
         }.onSuccess {
             finally(context.getString(R.string.success))
         }
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index a82f4f767..f4dce4213 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:padding="16dp">
 
     <TextView
@@ -10,6 +11,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:singleLine="true"
+        android:textColor="@color/primaryText"
+        tools:text="@string/name"
         app:layout_constraintRight_toLeftOf="@+id/iv_download"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintLeft_toLeftOf="parent" />
@@ -19,6 +22,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:singleLine="true"
+        android:textColor="@color/primaryText"
+        tools:text="@string/author"
         app:layout_constraintRight_toLeftOf="@+id/iv_download"
         app:layout_constraintTop_toBottomOf="@+id/tv_name"
         app:layout_constraintLeft_toLeftOf="parent" />
@@ -28,6 +33,8 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:singleLine="true"
+        android:textColor="@color/secondaryText"
+        tools:text="@string/action_download"
         app:layout_constraintRight_toLeftOf="@+id/iv_download"
         app:layout_constraintTop_toBottomOf="@id/tv_author"
         app:layout_constraintLeft_toLeftOf="parent" />
@@ -52,6 +59,7 @@
         android:background="?attr/selectableItemBackground"
         android:padding="10dp"
         android:text="@string/export"
+        android:textColor="@color/primaryText"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
diff --git a/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java b/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java
index 853d1a5e4..ad8ecab91 100644
--- a/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java
+++ b/epublib/src/main/java/me/ag2s/epublib/util/ResourceUtil.java
@@ -51,9 +51,9 @@ public class ResourceUtil {
     public static Resource createPublicResource(String name, String author, String intro, String kind, String wordCount, String model, String href) {
         String html = model.replace("{name}", name)
                 .replace("{author}", author)
-                .replace("{kind}", kind)
-                .replace("{wordCount}", wordCount)
-                .replace("{intro}", StringUtil.formatHtml(intro));
+                .replace("{kind}", kind == null ? "" : kind)
+                .replace("{wordCount}", wordCount == null ? "" : wordCount)
+                .replace("{intro}", StringUtil.formatHtml(intro == null ? "" : intro));
         return new Resource(html.getBytes(), href);
     }