lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix search filters

Browse Source
This commit is contained in:
MM20
2024-12-20 13:34:10 +01:00
parent d565da1492
commit cc339307bb
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
+32 -6
View File
@@ -58,7 +58,21 @@ internal class SearchServiceImpl(
initialResults: SearchResults?,
): Flow<SearchResults> = flow {
supervisorScope {
val results = MutableStateFlow(initialResults ?: SearchResults())
val results = MutableStateFlow(
initialResults?.let {
it.copy(
apps = if (filters.apps) it.apps else null,
shortcuts = if (filters.shortcuts) it.shortcuts else null,
contacts = if (filters.contacts) it.contacts else null,
calendars = if (filters.events) it.calendars else null,
files = if (filters.files) it.files else null,
calculators = if (filters.tools) it.calculators else null,
unitConverters = if (filters.tools) it.unitConverters else null,
websites = if (filters.websites) it.websites else null,
wikipedia = if (filters.articles) it.wikipedia else null,
)
}
?: SearchResults())
val customAttrResults = customAttributesRepository.search(query)
.map { items ->
@@ -266,13 +280,25 @@ internal class SearchServiceImpl(
val standardProfileApps = mutableListOf<Application>()
val workProfileApps = mutableListOf<Application>()
val privateSpaceApps = mutableListOf<Application>()
for (app in apps) {
for (app in apps) {
when {
standardProfile != null && app.user == standardProfile.userHandle -> standardProfileApps.add(app)
workProfile != null && app.user == workProfile.userHandle -> workProfileApps.add(app)
privateSpace != null && app.user == privateSpace.userHandle -> privateSpaceApps.add(app)
standardProfile != null && app.user == standardProfile.userHandle -> standardProfileApps.add(
app
)
workProfile != null && app.user == workProfile.userHandle -> workProfileApps.add(
app
)
privateSpace != null && app.user == privateSpace.userHandle -> privateSpaceApps.add(
app
)
else -> {
Log.w("MM20", "App ${app.label} does not belong to any known profile. Ignoring.")
Log.w(
"MM20",
"App ${app.label} does not belong to any known profile. Ignoring."
)
}
}
}