Fix empty response in faphub category (#993)

**Background** Right now we filter in incorrect way faphub category items **Changes** Distinct items inside content request, not after **Test plan** Try open category folder and switch between sort type
flipperdevices · Nov 26, 2024 · bcebc1c · bcebc1c
1 parent b5f3df1
commit bcebc1c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 # 1.8.1 - In Progress
 
+- [FIX] Fix empty response in faphub category
 - [FIX] New file manager uploading progress
 - [FIX] Fix build when no metrics enabled
 

diff --git a/...pl/src/main/java/com/flipperdevices/faphub/catalogtab/impl/viewmodel/FapsListViewModel.kt b/...pl/src/main/java/com/flipperdevices/faphub/catalogtab/impl/viewmodel/FapsListViewModel.kt
@@ -59,8 +59,8 @@ class FapsListViewModel @Inject constructor(
             PagingConfig(pageSize = FAPS_PAGE_SIZE)
         ) {
             FapsPagingSource(fapNetworkApi, sortType, target, hiddenItems)
-        }.flow
-    }.flatMapLatest { it }.distinctBy { it.id }.cachedIn(viewModelScope)
+        }.flow.distinctBy { it.id }
+    }.flatMapLatest { it }.cachedIn(viewModelScope)
 
     fun getFapsFlow(): Flow<PagingData<FapItemShort>> = faps
 

diff --git a/...rc/main/java/com/flipperdevices/faphub/category/impl/viewmodel/FapHubCategoryViewModel.kt b/...rc/main/java/com/flipperdevices/faphub/category/impl/viewmodel/FapHubCategoryViewModel.kt
@@ -56,8 +56,8 @@ class FapHubCategoryViewModel @AssistedInject constructor(
             PagingConfig(pageSize = FAPS_PAGE_SIZE)
         ) {
             FapsCategoryPagingSource(fapNetworkApi, category, sortType, target, hiddenItems)
-        }.flow
-    }.flatMapLatest { it }.distinctBy { it.id }.cachedIn(viewModelScope)
+        }.flow.distinctBy { it.id }
+    }.flatMapLatest { it }.cachedIn(viewModelScope)
 
     fun getFapsFlow() = faps
 

diff --git a/...pl/src/main/java/com/flipperdevices/faphub/search/impl/viewmodel/FapHubSearchViewModel.kt b/...pl/src/main/java/com/flipperdevices/faphub/search/impl/viewmodel/FapHubSearchViewModel.kt
@@ -35,8 +35,8 @@ class FapHubSearchViewModel @Inject constructor(
         }
         Pager(PagingConfig(pageSize = FAPS_PAGE_SIZE)) {
             FapsSearchPagingSource(fapNetworkApi, searchRequest, target, hiddenItems)
-        }.flow
-    }.flatMapLatest { it }.distinctBy { it.id }.cachedIn(viewModelScope)
+        }.flow.distinctBy { it.id }
+    }.flatMapLatest { it }.cachedIn(viewModelScope)
 
     fun getSearchRequest() = searchRequestFlow.asStateFlow()