Skip to content

Commit ce9dc78

Browse files
Merge pull request #6244 from nextcloud/backport/6219/stable-24.0
[stable-24.0] delete quote when reply is deleted
2 parents ba3e79a + d466c90 commit ce9dc78

2 files changed

Lines changed: 9 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
@@ -185,9 +185,10 @@ fun MessageScaffold(
185185
}
186186
}
187187

188-
val showQuote = uiMessage.parentMessage?.let {
189-
it.id.toLong() != conversationThreadId
190-
} ?: false
188+
val showQuote = !uiMessage.isDeleted &&
189+
uiMessage.parentMessage?.let {
190+
it.id.toLong() != conversationThreadId
191+
} ?: false
191192

192193
val showInlineMetadata = shouldShowTimeNextToContent(
193194
message = uiMessage,

gradle/verification-metadata.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20366,6 +20366,11 @@
2036620366
<sha256 value="7d3c06bb559c9f9af8daae2af83092d9569738142b2e90654b6baddb7e7def89" origin="Generated by Gradle"/>
2036720367
</artifact>
2036820368
</component>
20369+
<component group="com.google.devtools.ksp" name="symbol-processing-api" version="2.3.8">
20370+
<artifact name="symbol-processing-api-2.3.8.module">
20371+
<sha256 value="a2176306fcc4483725f8eaf749537324dec5de8a019f0395e95a06a0ae7f7772" origin="Generated by Gradle"/>
20372+
</artifact>
20373+
</component>
2036920374
<component group="com.google.devtools.ksp" name="symbol-processing-cmdline" version="2.1.10-1.0.29">
2037020375
<artifact name="symbol-processing-cmdline-2.1.10-1.0.29.jar">
2037120376
<sha256 value="b5c69be50ef939a21c23d1132457ce1566a0aced2c44cabceca8788320df58b8" origin="Generated by Gradle"/>

0 commit comments

Comments
 (0)