From f5d0e22eaafe6884a5256a500f07c5dde96ebcaf Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 31 Jan 2022 23:42:26 +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

---
 .../java/io/legado/app/data/entities/BookSource.kt  |  2 +-
 .../main/java/io/legado/app/help/SourceAnalyzer.kt  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/data/entities/BookSource.kt b/app/src/main/java/io/legado/app/data/entities/BookSource.kt
index 247dfc379..2643ced1b 100644
--- a/app/src/main/java/io/legado/app/data/entities/BookSource.kt
+++ b/app/src/main/java/io/legado/app/data/entities/BookSource.kt
@@ -136,7 +136,7 @@ data class BookSource(
 
     fun hasGroup(group: String): Boolean {
         bookSourceGroup?.splitNotBlank(AppPattern.splitGroupRegex)?.toHashSet()?.let {
-           return if (it.indexOf(group) != -1) true else false
+           return it.indexOf(group) != -1
         }
         return false
     }
diff --git a/app/src/main/java/io/legado/app/help/SourceAnalyzer.kt b/app/src/main/java/io/legado/app/help/SourceAnalyzer.kt
index f84159c01..0f3ae55bb 100644
--- a/app/src/main/java/io/legado/app/help/SourceAnalyzer.kt
+++ b/app/src/main/java/io/legado/app/help/SourceAnalyzer.kt
@@ -7,6 +7,7 @@ import io.legado.app.constant.BookType
 import io.legado.app.data.entities.BookSource
 import io.legado.app.data.entities.rule.*
 import io.legado.app.utils.*
+import splitties.init.appCtx
 import timber.log.Timber
 import java.util.regex.Pattern
 
@@ -17,11 +18,13 @@ object SourceAnalyzer {
 
     fun jsonToBookSources(json: String): List<BookSource> {
         val bookSources = mutableListOf<BookSource>()
-        val items: List<Map<String, Any>> = jsonPath.parse(json).read("$")
-        for (item in items) {
-            val jsonItem = jsonPath.parse(item)
-            jsonToBookSource(jsonItem.jsonString())?.let {
-                bookSources.add(it)
+        if (json.isJsonArray()) {
+            val items: List<Map<String, Any>> = jsonPath.parse(json).read("$")
+            for (item in items) {
+                val jsonItem = jsonPath.parse(item)
+                jsonToBookSource(jsonItem.jsonString())?.let {
+                    bookSources.add(it)
+                }
             }
         }
         return bookSources