From 6e48b6ad793ab8efd74a684d47403c6645139484 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Thu, 11 Apr 2024 08:16:14 +0800
Subject: [PATCH] Revert "Use refreshing state"

This reverts commit 3d283bd5
---
 .../components/account/AccountActivity.kt      | 12 ++----------
 .../components/account/AccountViewModel.kt     | 18 ++++++------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
index e5f58789e..d200a7663 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountActivity.kt
@@ -488,16 +488,8 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvide
     private fun setupRefreshLayout() {
         binding.swipeToRefreshLayout.setOnRefreshListener { onRefresh() }
         lifecycleScope.launch {
-            viewModel.refreshState.collect {
-                when (it) {
-                    AccountViewModel.RefreshState.INITIAL -> Unit
-                    AccountViewModel.RefreshState.REFRESHING -> {
-                        binding.swipeToRefreshLayout.isRefreshing = true
-                    }
-                    AccountViewModel.RefreshState.IDLE -> {
-                        binding.swipeToRefreshLayout.isRefreshing = false
-                    }
-                }
+            viewModel.isRefreshing.collect {
+                binding.swipeToRefreshLayout.isRefreshing = it
             }
         }
         binding.swipeToRefreshLayout.setColorSchemeResources(R.color.tusky_blue)
diff --git a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountViewModel.kt b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountViewModel.kt
index 74860370f..8f785ab61 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/account/AccountViewModel.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/account/AccountViewModel.kt
@@ -42,8 +42,8 @@ class AccountViewModel @Inject constructor(
     private val _noteSaved = MutableStateFlow(false)
     val noteSaved: StateFlow<Boolean> = _noteSaved.asStateFlow()
 
-    private val _refreshState = MutableStateFlow(RefreshState.INITIAL)
-    val refreshState: StateFlow<RefreshState> = _refreshState.asStateFlow()
+    private val _isRefreshing = MutableStateFlow(false)
+    val isRefreshing: StateFlow<Boolean> = _isRefreshing.asStateFlow()
 
     lateinit var accountId: String
     var isSelf = false
@@ -71,7 +71,7 @@ class AccountViewModel @Inject constructor(
     private fun obtainAccount(reload: Boolean = false) {
         if (_accountData.value == null || reload) {
             if (reload) {
-                _refreshState.value = RefreshState.REFRESHING
+                _isRefreshing.value = true
             }
             _accountData.value = Loading()
 
@@ -83,12 +83,12 @@ class AccountViewModel @Inject constructor(
                             isFromOwnDomain = domain == activeAccount.domain
 
                             _accountData.value = Success(account)
-                            _refreshState.value = RefreshState.IDLE
+                            _isRefreshing.value = false
                         },
                         { t ->
                             Log.w(TAG, "failed obtaining account", t)
                             _accountData.value = Error(cause = t)
-                            _refreshState.value = RefreshState.IDLE
+                            _isRefreshing.value = false
                         }
                     )
             }
@@ -310,7 +310,7 @@ class AccountViewModel @Inject constructor(
     }
 
     private fun reload(isReload: Boolean = false) {
-        if (_refreshState.value == RefreshState.REFRESHING) {
+        if (_isRefreshing.value) {
             return
         }
         accountId.let {
@@ -338,12 +338,6 @@ class AccountViewModel @Inject constructor(
         UNSUBSCRIBE
     }
 
-    enum class RefreshState {
-        INITIAL,
-        REFRESHING,
-        IDLE
-    }
-
     companion object {
         const val TAG = "AccountViewModel"
     }