Mastodon/pachli-android
1
0
Fork 0
mirror of https://github.com/pachli/pachli-android.git synced 2025-02-08 07:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Don't crash when deserializing notification types (#442)

Browse Source 
When the `Notification.Type` enum was moved to a separate module it
resulted in exceptions trying to deserialize the enum:

```
java.lang.RuntimeException: Parcelable encountered ClassNotFoundException reading a Serializable object (name = app.pachli.core.network.model.Notification$Type)
```

This happened in debug builds without Proguard, so not a minification or
renaming issue.

Fix this by providing `putEnum`/`getEnum` extension functions on
`Bundle` that store the enum's ordinal value and restore it from that.
This commit is contained in:
Nik Clayton 2024-02-14 23:55:46 +01:00 committed by GitHub
parent b7368fd62e
commit 0d826bc2d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/app/pachli/components/notifications/NotificationHelper.kt
View File

@ -209,7 +209,7 @@ fun makeNotification(
// Add the sending account's name, so it can be used when summarising this notification
val extras = Bundle()
extras.putString(EXTRA_ACCOUNT_NAME, notif.account.name)
extras.putSerializable(EXTRA_NOTIFICATION_TYPE, notif.type)
extras.putEnum(EXTRA_NOTIFICATION_TYPE, notif.type)
builder.addExtras(extras)
// Only alert for the first notification of a batch to avoid multiple alerts at once
@ -290,11 +290,7 @@ fun updateSummaryNotifications(
// Create a notification that summarises the other notifications in this group
// All notifications in this group have the same type, so get it from the first.
val notificationType = (
members[0].notification.extras.getSerializable(
EXTRA_NOTIFICATION_TYPE,
) as Notification.Type?
)!!
val notificationType = members[0].notification.extras.getEnum<Notification.Type>(EXTRA_NOTIFICATION_TYPE)
val summaryResultIntent = MainActivityIntent.openNotification(
context,
accountId.toLong(),
@ -871,3 +867,18 @@ fun pendingIntentFlags(mutable: Boolean): Int {
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
}
}
/**
* Returns the enum associated with the given [key].
*
* @throws IllegalStateException if the value at [key] is not valid for the enum [T].
*/
inline fun <reified T : Enum<T>> Bundle.getEnum(key: String) =
getInt(key, -1).let { if (it >= 0) enumValues<T>()[it] else throw IllegalStateException("unrecognised enum ordinal: $it") }
/**
* Inserts an enum [value] into the mapping of this [Bundle], replacing any
* existing value for the given [key].
*/
fun <T : Enum<T>> Bundle.putEnum(key: String, value: T?) =
putInt(key, value?.ordinal ?: -1)