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

Fix crash when an icon pack references an invalid resource id

Browse Source
This commit is contained in:
MM20 2022-07-31 21:47:06 +02:00
parent 389b33aebe
commit c423aa2fff
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt
View File

@ -69,7 +69,11 @@ class IconPackManager(
} }
val resId = res.getIdentifier(drawableName, "drawable", iconPack).takeIf { it != 0 } val resId = res.getIdentifier(drawableName, "drawable", iconPack).takeIf { it != 0 }
?: return null ?: return null
val drawable = ResourcesCompat.getDrawable(res, resId, context.theme) ?: return null val drawable = try {
ResourcesCompat.getDrawable(res, resId, context.theme) ?: return null
} catch (e: Resources.NotFoundException) {
return null
}
return when (drawable) { return when (drawable) {
is AdaptiveIconDrawable -> { is AdaptiveIconDrawable -> {
return StaticLauncherIcon( return StaticLauncherIcon(
@ -148,7 +152,11 @@ class IconPackManager(
if (mask != null) { if (mask != null) {
res.getIdentifier(mask, "drawable", pack).takeIf { it != 0 }?.let { res.getIdentifier(mask, "drawable", pack).takeIf { it != 0 }?.let {
paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OUT) paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OUT)
val maskDrawable = ResourcesCompat.getDrawable(res, it, null) ?: return null val maskDrawable = try {
ResourcesCompat.getDrawable(res, it, null) ?: return null
} catch (e: Resources.NotFoundException) {
return null
}
val maskBmp = maskDrawable.toBitmap(size, size) val maskBmp = maskDrawable.toBitmap(size, size)
inBounds = Rect(0, 0, maskBmp.width, maskBmp.height) inBounds = Rect(0, 0, maskBmp.width, maskBmp.height)
outBounds = Rect(0, 0, bitmap.width, bitmap.height) outBounds = Rect(0, 0, bitmap.width, bitmap.height)
@ -158,7 +166,11 @@ class IconPackManager(
if (upon != null) { if (upon != null) {
res.getIdentifier(upon, "drawable", pack).takeIf { it != 0 }?.let { res.getIdentifier(upon, "drawable", pack).takeIf { it != 0 }?.let {
paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_OVER) paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_OVER)
val maskDrawable = ResourcesCompat.getDrawable(res, it, null) ?: return null val maskDrawable = try {
ResourcesCompat.getDrawable(res, it, null) ?: return null
} catch (e: Resources.NotFoundException) {
return null
}
val maskBmp = maskDrawable.toBitmap(size, size) val maskBmp = maskDrawable.toBitmap(size, size)
inBounds = Rect(0, 0, maskBmp.width, maskBmp.height) inBounds = Rect(0, 0, maskBmp.width, maskBmp.height)
outBounds = Rect(0, 0, bitmap.width, bitmap.height) outBounds = Rect(0, 0, bitmap.width, bitmap.height)
@ -168,7 +180,11 @@ class IconPackManager(
if (back != null) { if (back != null) {
res.getIdentifier(back, "drawable", pack).takeIf { it != 0 }?.let { res.getIdentifier(back, "drawable", pack).takeIf { it != 0 }?.let {
paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OVER) paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OVER)
val maskDrawable = ResourcesCompat.getDrawable(res, it, null) ?: return null val maskDrawable = try {
ResourcesCompat.getDrawable(res, it, null) ?: return null
} catch (e: Resources.NotFoundException) {
return null
}
val maskBmp = maskDrawable.toBitmap(size, size) val maskBmp = maskDrawable.toBitmap(size, size)
inBounds = Rect(0, 0, maskBmp.width, maskBmp.height) inBounds = Rect(0, 0, maskBmp.width, maskBmp.height)
outBounds = Rect(0, 0, bitmap.width, bitmap.height) outBounds = Rect(0, 0, bitmap.width, bitmap.height)