Fix Favourites Crash

Droid-ify · Aug 19, 2023 · ccc3359 · ccc3359
1 parent c3d8472
commit ccc3359
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/src/main/kotlin/com/looker/droidify/ui/favourites/FavouriteFragmentAdapter.kt b/app/src/main/kotlin/com/looker/droidify/ui/favourites/FavouriteFragmentAdapter.kt
@@ -56,7 +56,7 @@ class FavouriteFragmentAdapter(
 	override fun getItemCount(): Int = apps.size
 
 	override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-		val item = apps[position].firstOrNull()?.item() ?: return
+		val item = apps[position].first().item()
 		val repository: Repository? = repositories[item.repositoryId]
 		holder.name.text = item.name
 		holder.summary.isVisible = item.summary.isNotEmpty()

diff --git a/app/src/main/kotlin/com/looker/droidify/ui/favourites/FavouritesViewModel.kt b/app/src/main/kotlin/com/looker/droidify/ui/favourites/FavouritesViewModel.kt
@@ -15,7 +15,6 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-
 @HiltViewModel
 class FavouritesViewModel @Inject constructor(
 	private val userPreferencesRepository: UserPreferencesRepository
@@ -25,8 +24,8 @@ class FavouritesViewModel @Inject constructor(
 		userPreferencesRepository.userPreferencesFlow
 			.distinctMap { it.favouriteApps }
 			.map { favourites ->
-				favourites.map { app ->
-					Database.ProductAdapter.get(app, null)
+				favourites.mapNotNull { app ->
+					Database.ProductAdapter.get(app, null).ifEmpty { null }
 				}
 			}.asStateFlow(emptyList())