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) {