From 1e1094f67808b5530cefdebe2c7265a5d61bccdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=A3=E5=8F=A3=E5=90=95?= <156081428@qq.com>
Date: Tue, 22 Sep 2020 22:42:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=A1=E9=AA=8C=E4=B9=A6?=
 =?UTF-8?q?=E6=BA=90=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/legado/app/constant/EventBus.kt    |  1 -
 .../legado/app/service/CheckSourceService.kt   |  2 --
 .../book/source/manage/BookSourceActivity.kt   | 18 +++++++++---------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/io/legado/app/constant/EventBus.kt b/app/src/main/java/io/legado/app/constant/EventBus.kt
index 8ea4122b9..27659fb17 100644
--- a/app/src/main/java/io/legado/app/constant/EventBus.kt
+++ b/app/src/main/java/io/legado/app/constant/EventBus.kt
@@ -20,7 +20,6 @@ object EventBus {
     const val WEB_SERVICE_STOP = "webServiceStop"
     const val UP_DOWNLOAD = "upDownload"
     const val SAVE_CONTENT = "saveContent"
-    const val CHECK_INIT = "checkInit"
     const val CHECK_UP_PROGRESS = "checkProgress"
     const val CHECK_UP_PROGRESS_STRING = "checkProgressTxt"
     const val CHECK_DONE = "checkDone"
diff --git a/app/src/main/java/io/legado/app/service/CheckSourceService.kt b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
index 705ff19c9..76d1e1a39 100644
--- a/app/src/main/java/io/legado/app/service/CheckSourceService.kt
+++ b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
@@ -80,8 +80,6 @@ class CheckSourceService : BaseService() {
         threadCount = min(allIds.size, threadCount)
         if (backgroundVerification) {
             updateNotification(0, getString(R.string.progress_show, "", 0, allIds.size))
-        } else {
-            postEvent(EventBus.CHECK_INIT, allIds.size)
         }
         for (i in 0 until threadCount) {
             check()
diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
index c461797dd..c4cbedb13 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt
@@ -15,6 +15,7 @@ import androidx.lifecycle.LiveData
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.snackbar.Snackbar
 import io.legado.app.App
 import io.legado.app.BuildConfig
 import io.legado.app.R
@@ -41,6 +42,7 @@ import io.legado.app.ui.widget.text.AutoCompleteTextView
 import io.legado.app.utils.*
 import kotlinx.android.synthetic.main.activity_book_source.*
 import kotlinx.android.synthetic.main.activity_book_source.recycler_view
+import kotlinx.android.synthetic.main.activity_book_source.title_bar
 import kotlinx.android.synthetic.main.dialog_edit_text.view.*
 import kotlinx.android.synthetic.main.dialog_progressbar_view.*
 import kotlinx.android.synthetic.main.dialog_progressbar_view.tv_footer_left
@@ -300,7 +302,12 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
                         CheckSource.keyword = it
                     }
                 }
-                CheckSource.start(this@BookSourceActivity, adapter.getSelection())
+                val bundle = Bundle()
+                bundle.putInt("maxProgress", adapter.getSelection().size)
+                CheckSourceDialog().apply {
+                    arguments = bundle
+                    CheckSource.start(this@BookSourceActivity, adapter.getSelection())
+                }.show(supportFragmentManager, "CheckDialog")
             }
             noButton { }
         }.show().applyTint()
@@ -390,18 +397,11 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
     }
 
     override fun observeLiveBus() {
-        observeEvent<Int>(EventBus.CHECK_INIT) { max->
-            val bundle = Bundle()
-            bundle.putInt("maxProgress", max)
-            CheckSourceDialog().apply {
-                arguments = bundle
-            }.show(supportFragmentManager, "CheckDialog")
-        }
         observeEvent<Int>(EventBus.CHECK_DONE) {
             groups.map { group->
                 if (group.contains("失效")) {
                     search_view.setQuery("失效", true)
-                    toast("发现有失效书源，已为您自动筛选！")
+                    Snackbar.make(title_bar, "发现有失效书源，已为您自动筛选！", Snackbar.LENGTH_LONG).show()
                 }
             }
         }