zapstore-mirror/de.markusfisch.android.binaryeye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fallback to getParcelableExtra(name)

Browse Source 
When getting the DECODE extra.

`getParcelableExtra(name, Class)` can throw on some versions
of Android when the ClassLoader associated with the Bundle's
lazy-decoded value is null in certain scenarios (e.g., after
an activity restart where the system re-delivers the intent).
Simply fallback to the "deprecated" `getParcelableExtra(name)`
which works in this case, because it doesn't verify the
parcelable's class against Scan::class.java.
This commit is contained in:
Markus Fisch
2026-02-23 21:00:30 +01:00
parent 097c5e4453
commit 7673b7cb0d
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/MainActivity.kt
+16 -9
View File
@@ -150,15 +150,22 @@ class MainActivity : AppCompatActivity() {
}
}
private fun Intent.getScanExtra(name: String): Scan? = try {
if (
Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
) {
@Suppress("DEPRECATION")
getParcelableExtra(name)
} else {
@Suppress("DEPRECATION")
private fun Intent.getScanExtra(name: String): Scan? = if (
Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
) {
try {
getParcelableExtra(name, Scan::class.java)
} catch (_: Throwable) {
// `getParcelableExtra(name, Class)` can throw on some versions
// of Android when the ClassLoader associated with the Bundle's
// lazy-decoded value is null in certain scenarios (e.g., after
// an activity restart where the system re-delivers the intent).
// Simply fallback to the "deprecated" `getParcelableExtra(name)`
// which works in this case, because it doesn't verify the
// parcelable's class against Scan::class.java.
null
}
} catch (_: Throwable) {
} else {
null
}
} ?: getParcelableExtra(name)