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

Fix SecurityException

Browse Source 
Fix #301
This commit is contained in:
MM20 2023-08-26 22:28:16 +02:00
parent 8ace6562cb
commit 28384972d5
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/applications/src/main/java/de/mm20/launcher2/applications/AppRepository.kt
View File

@ -113,7 +113,11 @@ internal class AppRepositoryImpl(
}, Handler(Looper.getMainLooper())) }, Handler(Looper.getMainLooper()))
val apps = profiles.map { p -> val apps = profiles.map { p ->
launcherApps.getActivityList(null, p).mapNotNull { getApplication(it, p) } try {
launcherApps.getActivityList(null, p).mapNotNull { getApplication(it, p) }
} catch (e: SecurityException) {
emptyList()
}
}.flatten() }.flatten()
installedApps.value = apps installedApps.value = apps
} }
@ -127,7 +131,11 @@ internal class AppRepositoryImpl(
if (packageName == context.packageName) return emptyList() if (packageName == context.packageName) return emptyList()
return profiles.map { p -> return profiles.map { p ->
launcherApps.getActivityList(packageName, p).mapNotNull { getApplication(it, p) } try {
launcherApps.getActivityList(packageName, p).mapNotNull { getApplication(it, p) }
} catch (e: SecurityException) {
emptyList()
}
}.flatten() }.flatten()
} }

8
data/applications/src/main/java/de/mm20/launcher2/search/data/AppSerialization.kt
View File

@ -36,8 +36,12 @@ class LauncherAppDeserializer(val context: Context) : SearchableDeserializer {
val intent = Intent().also { val intent = Intent().also {
it.component = ComponentName(pkg, json.getString("activity")) it.component = ComponentName(pkg, json.getString("activity"))
} }
val launcherActivityInfo = launcherApps.resolveActivity(intent, user) ?: return null try {
return LauncherApp(context, launcherActivityInfo) val launcherActivityInfo = launcherApps.resolveActivity(intent, user) ?: return null
return LauncherApp(context, launcherActivityInfo)
} catch (e: SecurityException) {
return null
}
} }
} }