diff --git a/app/src/main/java/io/heckel/ntfy/msg/Message.kt b/app/src/main/java/io/heckel/ntfy/msg/Message.kt index bc3799c..8de0ab8 100644 --- a/app/src/main/java/io/heckel/ntfy/msg/Message.kt +++ b/app/src/main/java/io/heckel/ntfy/msg/Message.kt @@ -13,7 +13,7 @@ data class Message( val priority: Int?, val tags: List?, val click: String?, - val icon: MessageIcon?, + val icon: String?, val actions: List?, val title: String?, val message: String, @@ -44,11 +44,4 @@ data class MessageAction( val extras: Map?, // used in "broadcast" action ) -@Keep -data class MessageIcon( - val url: String, - val type: String?, - val size: Long?, -) - const val MESSAGE_ENCODING_BASE64 = "base64" diff --git a/app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt b/app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt index 644cc47..d26f5d0 100644 --- a/app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt +++ b/app/src/main/java/io/heckel/ntfy/msg/NotificationParser.kt @@ -32,13 +32,6 @@ class NotificationParser { url = message.attachment.url, ) } else null - val icon = if (message.icon?.url != null) { - Icon( - url = message.icon.url, - type = message.icon.type, - size = message.icon.size, - ) - } else null val actions = if (message.actions != null) { message.actions.map { a -> Action( @@ -57,6 +50,13 @@ class NotificationParser { ) } } else null + val icon: Icon? = if (message.icon != null) { + Icon( + url = message.icon, + size = null, + type = null + ) + } else null val notification = Notification( id = message.id, subscriptionId = subscriptionId,