Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1001,16 +1001,11 @@ class ChatActivity :
var result: String? = null
message?.let {
if (message.messageParameters.isNotEmpty()) {
runCatching {
message.messageParameters as HashMap<String?, HashMap<String?, String?>>?
val fileParameters = FileParameters(message.messageParameters)
result = fileParameters.id
}.onFailure { e ->
when (e) {
is ClassCastException -> {} // weird
else -> Log.e(TAG, "Error in LazyListState.visibleItemsWithThreshold $e")
}
}
val normalizedParameters = HashMap<String?, HashMap<String?, String?>>(
message.messageParameters.mapValues { (_, params) -> HashMap(params) }
)
val fileParameters = FileParameters(normalizedParameters)
result = fileParameters.id
}
}

Expand Down
8 changes: 7 additions & 1 deletion app/src/main/java/com/nextcloud/talk/ui/chat/MediaMessage.kt
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,13 @@ fun MediaMessage(
onImageClick: (Int) -> Unit
) {
val fileParameters =
remember { FileParameters(message.messageParameters as HashMap<String?, HashMap<String?, String?>>?) }
remember {
FileParameters(
HashMap(
message.messageParameters.mapValues { (_, params) -> HashMap(params) }
)
)
}

val hasExplicitCaption = message.plainMessage != FILE_PLACEHOLDER_MESSAGE
val hasPreview = !typeContent.previewUrl.isNullOrEmpty()
Expand Down
Loading