From dbd885fb9c341dbf994b5ae13f54613a4f57d1fe Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sat, 31 Dec 2022 16:12:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=87=A0=E4=B8=AA=20B?=
 =?UTF-8?q?ug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/huanchengfly/tieba/post/activities/LoginActivity.kt    | 3 ++-
 .../com/huanchengfly/tieba/post/activities/ThreadActivity.kt   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt
index 69df01ab..376f8ea8 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt
@@ -62,12 +62,13 @@ class LoginActivity : BaseActivity(), WebViewListener {
                     snackBar.show()
                     launch {
                         AccountUtil.fetchAccountFlow(bduss, sToken, cookies)
+                            .flowOn(Dispatchers.IO)
                             .catch { e ->
                                 snackBar.setText("登录失败 ${e.getErrorMessage()}")
                                 view.loadUrl("https://wappass.baidu.com/passport?login&u=https%3A%2F%2Ftieba.baidu.com%2Findex%2Ftbwise%2Fmine")
                                 handler.postDelayed({ snackBar.dismiss() }, 1500)
                             }
-                            .flowOn(Dispatchers.IO)
+                            .flowOn(Dispatchers.Main)
                             .collect { account ->
                                 AccountUtil.newAccount(account.uid, account) {
                                     if (it) {
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/ThreadActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/ThreadActivity.kt
index d0bbf7dc..5e20691d 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/activities/ThreadActivity.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/ThreadActivity.kt
@@ -756,7 +756,8 @@ class ThreadActivity : BaseActivity(), View.OnClickListener, IThreadMenuFragment
                     show(supportFragmentManager, "Menu")
                 }
             }
-            R.id.thread_bottom_bar_agree -> if (dataBean != null && dataBean!!.thread != null) {
+
+            R.id.thread_bottom_bar_agree -> if (dataBean?.thread?.threadInfo?.threadId != null && dataBean?.thread?.threadInfo?.firstPostId != null) {
                 if (!agree) {
                     agree = true
                     agreeNum += 1