diff --git a/core/profiles/src/main/java/de/mm20/launcher2/profiles/ProfileManager.kt b/core/profiles/src/main/java/de/mm20/launcher2/profiles/ProfileManager.kt index 514854aef..25eb36c18 100644 --- a/core/profiles/src/main/java/de/mm20/launcher2/profiles/ProfileManager.kt +++ b/core/profiles/src/main/java/de/mm20/launcher2/profiles/ProfileManager.kt @@ -72,11 +72,6 @@ class ProfileManager( it.mapNotNull { it?.profile } }.shareIn(scope, SharingStarted.WhileSubscribed(), replay = 1) - val hiddenPrivateSpaceUser: Flow = profileStates.map { profiles -> - val private = profiles[2] - if (private?.state?.hidden == true) private.profile.userHandle else null - }.shareIn(scope, SharingStarted.WhileSubscribed(), replay = 1) - init { val receiver = object : BroadcastReceiver() { override fun onReceive(context: Context?, intent: Intent?) { diff --git a/services/favorites/build.gradle.kts b/services/favorites/build.gradle.kts index 149458d31..ce55f6f63 100644 --- a/services/favorites/build.gradle.kts +++ b/services/favorites/build.gradle.kts @@ -47,7 +47,6 @@ dependencies { implementation(project(":core:base")) implementation(project(":core:i18n")) - implementation(project(":core:profiles")) implementation(project(":data:searchable")) } \ No newline at end of file diff --git a/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt b/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt index 34ca51da0..82add75f0 100644 --- a/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt +++ b/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/FavoritesService.kt @@ -1,18 +1,13 @@ package de.mm20.launcher2.services.favorites -import de.mm20.launcher2.profiles.ProfileManager -import de.mm20.launcher2.search.Application import de.mm20.launcher2.search.SavableSearchable import de.mm20.launcher2.searchable.PinnedLevel import de.mm20.launcher2.searchable.SavableSearchableRepository import de.mm20.launcher2.searchable.VisibilityLevel import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.flatMapLatest class FavoritesService( private val searchableRepository: SavableSearchableRepository, - private val profileManager: ProfileManager, ) { fun getFavorites( includeTypes: List? = null, @@ -21,23 +16,14 @@ class FavoritesService( maxPinnedLevel: PinnedLevel = PinnedLevel.ManuallySorted, limit: Int = 100, ): Flow> { - return profileManager.activeProfiles.flatMapLatest { - combine( - searchableRepository.get( - includeTypes = includeTypes, - excludeTypes = excludeTypes, - minPinnedLevel = minPinnedLevel, - maxPinnedLevel = maxPinnedLevel, - limit = Int.MAX_VALUE, - minVisibility = VisibilityLevel.SearchOnly, - ), - profileManager.hiddenPrivateSpaceUser, - ) { items, hiddenUser -> - val filtered = if (hiddenUser == null) items - else items.filter { it !is Application || it.user != hiddenUser } - filtered.take(limit) - } - } + return searchableRepository.get( + includeTypes = includeTypes, + excludeTypes = excludeTypes, + minPinnedLevel = minPinnedLevel, + maxPinnedLevel = maxPinnedLevel, + limit = limit, + minVisibility = VisibilityLevel.SearchOnly, + ) } fun isPinned(searchable: SavableSearchable): Flow { diff --git a/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/Module.kt b/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/Module.kt index 844a782f1..a455c66d3 100644 --- a/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/Module.kt +++ b/services/favorites/src/main/java/de/mm20/launcher2/services/favorites/Module.kt @@ -3,5 +3,5 @@ package de.mm20.launcher2.services.favorites import org.koin.dsl.module val favoritesModule = module { - factory { FavoritesService(get(), get()) } + factory { FavoritesService(get()) } } \ No newline at end of file