Initialize with 'All' filter (#854)

jocmp · Feb 12, 2025 · 09631e4 · 09631e4
1 parent e496504
commit 09631e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/com/capyreader/app/ui/articles/ArticleScreen.kt b/app/src/main/java/com/capyreader/app/ui/articles/ArticleScreen.kt
@@ -78,7 +78,9 @@ fun ArticleScreen(
             article = viewModel.article,
             statusCount = statusCount,
             refreshInterval = appPreferences.refreshInterval.get(),
-            onInitialized = viewModel::initialize,
+            onInitialized = { completion ->
+                viewModel.initialize(onComplete = completion)
+            },
             onFeedRefresh = viewModel::refreshFeed,
             drawerState = drawerState,
             onSelectFolder = viewModel::selectFolder,

diff --git a/app/src/main/java/com/capyreader/app/ui/articles/ArticleScreenViewModel.kt b/app/src/main/java/com/capyreader/app/ui/articles/ArticleScreenViewModel.kt
@@ -251,11 +251,14 @@ class ArticleScreenViewModel(
         }
     }
 
-    fun initialize(onComplete: () -> Unit) {
+    fun initialize(
+        filter: ArticleFilter = ArticleFilter.default(),
+        onComplete: () -> Unit,
+    ) {
         refreshJob?.cancel()
 
         refreshJob = viewModelScope.launch(Dispatchers.IO) {
-            account.refresh(latestFilter).onFailure { throwable ->
+            account.refresh(filter).onFailure { throwable ->
                 if (throwable is UnauthorizedError && _showUnauthorizedMessage == UnauthorizedMessageState.HIDE) {
                     _showUnauthorizedMessage = UnauthorizedMessageState.SHOW
                 }
@@ -266,7 +269,7 @@ class ArticleScreenViewModel(
     }
 
     fun refreshFeed(onComplete: () -> Unit) {
-        initialize {
+        initialize(latestFilter) {
             updateArticlesSince()
             onComplete()
         }