From 95afb6954a5c04725a62378751de186875339cfc Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Sat, 31 Dec 2022 15:15:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                    |  1 -
 .../tieba/post/fragments/MessageFragment.kt         | 13 ++++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index de0c2584..ed9b191d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,7 +48,6 @@
         android:name=".App"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
-        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher_new"
         android:label="@string/app_name"
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/MessageFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/MessageFragment.kt
index f8c24e0b..2a122b7c 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/MessageFragment.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/MessageFragment.kt
@@ -186,9 +186,16 @@ class MessageFragment : BaseFragment(), Refreshable, OnTabSelectedListener,
                     } else {
                         adapter.addData(it)
                     }
-                    smartRefreshLayout.finishRefresh(true)
-                    if (it.page?.hasMore != "1") {
-                        smartRefreshLayout.finishRefreshWithNoMoreData()
+                    if (reload) {
+                        smartRefreshLayout.finishRefresh(true)
+                        if (it.page?.hasMore != "1") {
+                            smartRefreshLayout.finishRefreshWithNoMoreData()
+                        }
+                    } else {
+                        smartRefreshLayout.finishLoadMore(true)
+                        if (it.page?.hasMore != "1") {
+                            smartRefreshLayout.finishLoadMoreWithNoMoreData()
+                        }
                     }
                 }.doIfFailure {
                     if (reload) {