From e1ae079ab6f8b02783b63e068eef8964771be40e Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <1021300691@qq.com>
Date: Wed, 4 May 2022 12:30:49 +0800
Subject: [PATCH] fix load book details when a book with the same name exists

---
 app/src/main/assets/updatelog.fy              |  3 +++
 .../ui/activity/BookDetailedActivity.java     |  8 ++++++-
 gradlew                                       | 22 +++++++++----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
index f399522..edcded0 100644
--- a/app/src/main/assets/updatelog.fy
+++ b/app/src/main/assets/updatelog.fy
@@ -1,6 +1,9 @@
 风月读书v2.4.5
 更新内容：
 1、修复书籍无法导出缓存的问题
+2、修复部分书源bug
+3、修复同名书籍详情页加载bug
+4、Cookie支持备份&恢复
 
 2022.04.24
 风月读书v2.4.4
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java
index 08a81a7..9572509 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/BookDetailedActivity.java
@@ -386,7 +386,13 @@ public class BookDetailedActivity extends BaseActivity<ActivityBookDetailBinding
      * @return
      */
     private boolean isBookCollected() {
-        Book book = mBookService.findBookByAuthorAndName(mBook.getName(), mBook.getAuthor());
+        Book book = null;
+        if (!TextUtils.isEmpty(mBook.getId())){
+            book = mBookService.getBookById(mBook.getId());
+        }
+        if (book == null) {
+            book = mBookService.findBookByAuthorAndName(mBook.getName(), mBook.getAuthor());
+        }
         if (book == null) {
             return false;
         } else {
diff --git a/gradlew b/gradlew
index 55291e6..b6cd197 100755
--- a/gradlew
+++ b/gradlew
@@ -2,20 +2,20 @@
 
 #
 # This file is part of FYReader.
-#  FYReader is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
+# FYReader is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-#  FYReader is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
+# FYReader is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License
-#  along with FYReader.  If not, see <https://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU General Public License
+# along with FYReader.  If not, see <https://www.gnu.org/licenses/>.
 #
-#  Copyright (C) 2020 - 2022 fengyuecanzhu
+# Copyright (C) 2020 - 2022 fengyuecanzhu
 #
 
 ##############################################################################