Skip to content

Commit a755efe

Browse files
Merge pull request #6239 from nextcloud/backport/6238/stable-24.0
[stable-24.0] fix display of time for edited messages
2 parents 2e1b2a3 + 4e4aea8 commit a755efe

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,14 @@ private fun shouldShowTimeNextToContent(
127127
showQuote: Boolean
128128
): Boolean {
129129
val containsLinebreak = message.message.contains("\n") || message.message.contains("\r")
130-
val shouldHideTime = forceTimeBelow ||
130+
val shouldShowTimeBelowContent = forceTimeBelow ||
131131
forceTimeOverlay ||
132132
message.hasMentionChips() ||
133133
showQuote ||
134-
containsLinebreak
134+
containsLinebreak ||
135+
message.isEdited
135136

136-
return !shouldHideTime && (message.message.length < MESSAGE_LENGTH_THRESHOLD)
137+
return !shouldShowTimeBelowContent && (message.message.length < MESSAGE_LENGTH_THRESHOLD)
137138
}
138139

139140
private val mentionChipTypes = setOf("user", "guest", "call", "user-group", "email", "circle")

0 commit comments

Comments
 (0)