Merge remote-tracking branch 'origin/master'

app/src/main/java/io/legado/app/service/CheckSourceService.kt

@@ -142,19 +142,18 @@ class CheckSourceService : BaseService() {
         }.timeout(180000L)
             .onError(searchCoroutine) {
                 source.addGroup("失效")
-                source.bookSourceComment = """
-                    "error:${it.localizedMessage}
-                    ${source.bookSourceComment}"
-                """.trimIndent()
+                if (source.bookSourceComment?.contains("Error: ") == false) {
+                    source.bookSourceComment = "Error: ${it.localizedMessage} \n\n" + "${source.bookSourceComment}"
+                }
                 Debug.updateFinalMessage(source.bookSourceUrl, "失败:${it.localizedMessage}")
                 source.respondTime = Debug.getRespondTime(source.bookSourceUrl)
                 appDb.bookSourceDao.update(source)
             }.onSuccess(searchCoroutine) {
                 source.removeGroup("失效")
                 source.bookSourceComment = source.bookSourceComment
-                    ?.split("\n")
+                    ?.split("\n\n")
                     ?.filterNot {
-                        it.startsWith("error:")
+                        it.startsWith("Error: ")
                     }?.joinToString("\n")
                 Debug.updateFinalMessage(source.bookSourceUrl, "成功")
                 source.respondTime = Debug.getRespondTime(source.bookSourceUrl)

app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@@ -467,7 +467,7 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
             snackBar?.dismiss()
             snackBar = null
             groups.map { group ->
-                if (group.contains("失效")) {
+                if (group.contains("失效") && searchView.query.isEmpty()) {
                     searchView.setQuery("失效", true)
                     toastOnUi("发现有失效书源，已为您自动筛选！")
                 }