Fix apps and shortcuts incorrectly deserialized if their profile has been removed

This commit is contained in:
MM20 2022-10-22 13:31:06 +02:00
parent 10d400a0c8
commit f5052f9bf7
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 2 additions and 2 deletions

View File

@ -32,7 +32,7 @@ class LauncherAppDeserializer(val context: Context) : SearchableDeserializer {
val launcherApps = context.getSystemService<LauncherApps>()!!
val userManager = context.getSystemService<UserManager>()!!
val userSerial = json.optLong("user")
val user = userManager.getUserForSerialNumber(userSerial) ?: Process.myUserHandle()
val user = userManager.getUserForSerialNumber(userSerial) ?: return null
val pkg = json.getString("package")
val intent = Intent().also {
it.component = ComponentName(pkg, json.getString("activity"))

View File

@ -55,7 +55,7 @@ class LauncherShortcutDeserializer(
)
query.setShortcutIds(mutableListOf(id))
val userManager = context.getSystemService<UserManager>()!!
val user = userManager.getUserForSerialNumber(userSerial) ?: Process.myUserHandle()
val user = userManager.getUserForSerialNumber(userSerial) ?: return null
val shortcuts = try {
launcherApps.getShortcuts(query, user)
} catch (e: IllegalStateException) {