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

Merge pull request #275 from cyb3rko/message-image-combine-fix

Browse Source 
Fix MessageImageCombiner error
This commit is contained in:
Jannis Mattheis
2023-02-06 13:20:39 +01:00
committed by GitHub
parent 7d9da0b25a 21383fba1b
commit 6bf3f26c16
3 changed files with 11 additions and 16 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)

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

@@ -6,14 +6,7 @@ import com.github.gotify.client.model.Message
internal object MessageImageCombiner { internal object MessageImageCombiner {
fun combine(messages: List<Message>, applications: List<Application>): List<MessageWithImage> { fun combine(messages: List<Message>, applications: List<Application>): List<MessageWithImage> {
val appIdToImage = appIdToImage(applications) val appIdToImage = appIdToImage(applications)
val result = mutableListOf<MessageWithImage>() return messages.map { MessageWithImage(message = it, image = appIdToImage[it.appid]) }
messages.forEach {
val messageWithImage = MessageWithImage()
messageWithImage.message = it
messageWithImage.image = appIdToImage[it.appid]!!
result.add(messageWithImage)
}
return result
} }
fun appIdToImage(applications: List<Application>): Map<Long, String> { fun appIdToImage(applications: List<Application>): Map<Long, String> {

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

@@ -2,7 +2,7 @@ package com.github.gotify.messages.provider
import com.github.gotify.client.model.Message import com.github.gotify.client.model.Message
internal class MessageWithImage { internal data class MessageWithImage(
lateinit var message: Message val message: Message,
lateinit var image: String val image: String?
} )