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

Catch potential SecurityException in app shortcut deserialization

Browse Source 
Close #665
This commit is contained in:
MM20 2024-12-04 19:00:10 +01:00
parent 37db43405f
commit bb55961b21
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
data/appshortcuts/src/main/java/de/mm20/launcher2/appshortcuts/AppShortcutSerialization.kt
View File

@ -6,6 +6,7 @@ import android.content.Intent.ShortcutIconResource
import android.content.pm.LauncherApps import android.content.pm.LauncherApps
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.UserManager import android.os.UserManager
import android.util.Log
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
import de.mm20.launcher2.ktx.jsonObjectOf import de.mm20.launcher2.ktx.jsonObjectOf
import de.mm20.launcher2.search.SavableSearchable import de.mm20.launcher2.search.SavableSearchable
@ -35,42 +36,48 @@ class LauncherShortcutDeserializer(
) : SearchableDeserializer, KoinComponent { ) : SearchableDeserializer, KoinComponent {
override suspend fun deserialize(serialized: String): SavableSearchable? { override suspend fun deserialize(serialized: String): SavableSearchable? {
val launcherApps = context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps try {
val launcherApps =
context.getSystemService(Context.LAUNCHER_APPS_SERVICE) as LauncherApps
val json = JSONObject(serialized) val json = JSONObject(serialized)
val packageName = json.getString("packagename") val packageName = json.getString("packagename")
val id = json.getString("id") val id = json.getString("id")
val userSerial = json.optLong("user") val userSerial = json.optLong("user")
val userManager = context.getSystemService<UserManager>()!! val userManager = context.getSystemService<UserManager>()!!
val user = userManager.getUserForSerialNumber(userSerial) ?: return null val user = userManager.getUserForSerialNumber(userSerial) ?: return null
if (!launcherApps.hasShortcutHostPermission()) { if (!launcherApps.hasShortcutHostPermission()) {
return UnavailableShortcut(context, id, packageName, user, userSerial) return UnavailableShortcut(context, id, packageName, user, userSerial)
}
else {
val query = LauncherApps.ShortcutQuery()
query.setPackage(packageName)
query.setQueryFlags(LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED or
LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC or
LauncherApps.ShortcutQuery.FLAG_MATCH_MANIFEST or
LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED or
LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER
)
query.setShortcutIds(mutableListOf(id))
val shortcuts = try {
launcherApps.getShortcuts(query, user)
} catch (e: IllegalStateException) {
return null
}
if (shortcuts.isNullOrEmpty()) {
return null
} else { } else {
return LauncherShortcut( val query = LauncherApps.ShortcutQuery()
context = context, query.setPackage(packageName)
launcherShortcut = shortcuts[0], query.setQueryFlags(
LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED or
LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC or
LauncherApps.ShortcutQuery.FLAG_MATCH_MANIFEST or
LauncherApps.ShortcutQuery.FLAG_MATCH_CACHED or
LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED_BY_ANY_LAUNCHER
) )
query.setShortcutIds(mutableListOf(id))
val shortcuts = try {
launcherApps.getShortcuts(query, user)
} catch (e: IllegalStateException) {
return null
}
if (shortcuts.isNullOrEmpty()) {
return null
} else {
return LauncherShortcut(
context = context,
launcherShortcut = shortcuts[0],
)
}
} }
} catch (e: SecurityException) {
Log.e("MM20", "Failed to deserialize shortcut: $serialized", e)
return null
} }
} }
} }