From bf6e0aa14ff0614b03acecc840dc74003e930081 Mon Sep 17 00:00:00 2001 From: Niko Diamadis Date: Sun, 5 Feb 2023 00:10:31 +0100 Subject: [PATCH 1/2] Fix error when combining Message and Image --- .../com/github/gotify/messages/ListMessageAdapter.kt | 10 ++++++---- .../gotify/messages/provider/MessageImageCombiner.kt | 2 +- .../gotify/messages/provider/MessageWithImage.kt | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt index 15451ea..0304528 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt @@ -79,10 +79,12 @@ internal class ListMessageAdapter( holder.message.text = message.message.message } holder.title.text = message.message.title - picasso.load(Utils.resolveAbsoluteUrl("${settings.url}/", message.image)) - .error(R.drawable.ic_alarm) - .placeholder(R.drawable.ic_placeholder) - .into(holder.image) + if (message.image != null) { + picasso.load(Utils.resolveAbsoluteUrl("${settings.url}/", message.image)) + .error(R.drawable.ic_alarm) + .placeholder(R.drawable.ic_placeholder) + .into(holder.image) + } val prefs = PreferenceManager.getDefaultSharedPreferences(context) val timeFormat = prefs.getString(timeFormatPrefsKey, timeFormatRelative) diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt index 7095aec..24f02bd 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt @@ -10,7 +10,7 @@ internal object MessageImageCombiner { messages.forEach { val messageWithImage = MessageWithImage() messageWithImage.message = it - messageWithImage.image = appIdToImage[it.appid]!! + messageWithImage.image = appIdToImage[it.appid] result.add(messageWithImage) } return result diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt index e99f730..951c654 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt @@ -4,5 +4,5 @@ import com.github.gotify.client.model.Message internal class MessageWithImage { lateinit var message: Message - lateinit var image: String + var image: String? = null } From 21383fba1b25dcb1e3e0a2530be6132d6136c34b Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Mon, 6 Feb 2023 13:13:45 +0100 Subject: [PATCH 2/2] Use data class --- .../gotify/messages/provider/MessageImageCombiner.kt | 9 +-------- .../github/gotify/messages/provider/MessageWithImage.kt | 8 ++++---- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt index 24f02bd..b5d2750 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt @@ -6,14 +6,7 @@ import com.github.gotify.client.model.Message internal object MessageImageCombiner { fun combine(messages: List, applications: List): List { val appIdToImage = appIdToImage(applications) - val result = mutableListOf() - messages.forEach { - val messageWithImage = MessageWithImage() - messageWithImage.message = it - messageWithImage.image = appIdToImage[it.appid] - result.add(messageWithImage) - } - return result + return messages.map { MessageWithImage(message = it, image = appIdToImage[it.appid]) } } fun appIdToImage(applications: List): Map { diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt index 951c654..9d1c293 100644 --- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt +++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt @@ -2,7 +2,7 @@ package com.github.gotify.messages.provider import com.github.gotify.client.model.Message -internal class MessageWithImage { - lateinit var message: Message - var image: String? = null -} +internal data class MessageWithImage( + val message: Message, + val image: String? +)