Merge pull request #3090 from wordpress-mobile/issue/12491-fix-load-more

Fix load more
wordpress-mobile · Sep 6, 2024 · a77c116 · a77c116
2 parents 3d8b46e + 3d6d1df
commit a77c116
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListState.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/model/list/ListState.kt
@@ -21,6 +21,7 @@ enum class ListState(val value: Int) {
     fun isLoadingMore() = this == LOADING_MORE
 
     companion object {
-        val defaultState = ListState.NEEDS_REFRESH
+        val defaultState = NEEDS_REFRESH
+        val notExpiredStates = setOf(CAN_LOAD_MORE, FETCHED)
     }
 }
diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/store/ListStore.kt
@@ -351,14 +351,17 @@ class ListStore @Inject constructor(
     /**
      * A helper function that returns the [ListState] for the given [ListDescriptor].
      */
-    private fun getListState(listDescriptor: ListDescriptor): ListState {
+     fun getListState(listDescriptor: ListDescriptor): ListState {
         val listModel = listSqlUtils.getList(listDescriptor)
-        return if (listModel != null && !isListStateOutdated(listModel)) {
-            requireNotNull(ListState.values().firstOrNull { it.value == listModel.stateDbValue }) {
+        val currentState = listModel?.let {
+            requireNotNull(ListState.entries.firstOrNull { it.value == listModel.stateDbValue }) {
                 "The stateDbValue of the ListModel didn't match any of the `ListState`s. This likely happened " +
                         "because the ListState values were altered without a DB migration."
             }
-        } else ListState.defaultState
+        }
+        val isListStateValid = currentState != null
+                && (isListStateOutdated(listModel).not() || (currentState in ListState.notExpiredStates))
+        return if (isListStateValid) currentState!! else ListState.defaultState
     }
 
     /**