kadu/gotify-android-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix error when combining Message and Image

Browse Source
This commit is contained in:
Niko Diamadis
2023-02-05 00:10:31 +01:00
parent 7d9da0b25a
commit bf6e0aa14f
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
View File

@@ -79,10 +79,12 @@ internal class ListMessageAdapter(
holder.message.text = message.message.message holder.message.text = message.message.message
} }
holder.title.text = message.message.title holder.title.text = message.message.title
picasso.load(Utils.resolveAbsoluteUrl("${settings.url}/", message.image)) if (message.image != null) {
.error(R.drawable.ic_alarm) picasso.load(Utils.resolveAbsoluteUrl("${settings.url}/", message.image))
.placeholder(R.drawable.ic_placeholder) .error(R.drawable.ic_alarm)
.into(holder.image) .placeholder(R.drawable.ic_placeholder)
.into(holder.image)
}
val prefs = PreferenceManager.getDefaultSharedPreferences(context) val prefs = PreferenceManager.getDefaultSharedPreferences(context)
val timeFormat = prefs.getString(timeFormatPrefsKey, timeFormatRelative) val timeFormat = prefs.getString(timeFormatPrefsKey, timeFormatRelative)

2
app/src/main/kotlin/com/github/gotify/messages/provider/MessageImageCombiner.kt
View File

@@ -10,7 +10,7 @@ internal object MessageImageCombiner {
messages.forEach { messages.forEach {
val messageWithImage = MessageWithImage() val messageWithImage = MessageWithImage()
messageWithImage.message = it messageWithImage.message = it
messageWithImage.image = appIdToImage[it.appid]!! messageWithImage.image = appIdToImage[it.appid]
result.add(messageWithImage) result.add(messageWithImage)
} }
return result return result

2
app/src/main/kotlin/com/github/gotify/messages/provider/MessageWithImage.kt
View File

@@ -4,5 +4,5 @@ import com.github.gotify.client.model.Message
internal class MessageWithImage { internal class MessageWithImage {
lateinit var message: Message lateinit var message: Message
lateinit var image: String var image: String? = null
} }