ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/fga/join_space

Browse Source
This commit is contained in:
Benoit Marty
2025-09-24 11:20:17 +02:00
committed by GitHub
parent f6cc4bcfa1 d391be7002
commit f3f19ec476
319 changed files with 2828 additions and 1838 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt
+1 -4
View File
@@ -134,10 +134,7 @@ class InReplyToDetailsOtherProvider : InReplyToDetailsProvider() {
private fun aMessageContent(
body: String,
type: MessageType,
threadInfo: EventThreadInfo = EventThreadInfo(
threadRootId = null,
threadSummary = null,
),
threadInfo: EventThreadInfo? = null,
) = MessageContent(
body = body,
inReplyTo = null,
libraries/matrixui/src/test/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailTest.kt
+2 -3
View File
@@ -8,7 +8,6 @@
package io.element.android.libraries.matrix.ui.messages.reply
import com.google.common.truth.Truth.assertThat
import io.element.android.libraries.matrix.api.timeline.item.EventThreadInfo
import io.element.android.libraries.matrix.api.timeline.item.event.FormattedBody
import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
import io.element.android.libraries.matrix.api.timeline.item.event.MembershipChange
@@ -70,7 +69,7 @@ class InReplyToDetailTest {
body = "**Hello!**",
inReplyTo = null,
isEdited = false,
threadInfo = EventThreadInfo(threadRootId = null, threadSummary = null),
threadInfo = null,
type = TextMessageType(
body = "**Hello!**",
formatted = FormattedBody(
@@ -95,7 +94,7 @@ class InReplyToDetailTest {
body = "**Hello!**",
inReplyTo = null,
isEdited = false,
threadInfo = EventThreadInfo(threadRootId = null, threadSummary = null),
threadInfo = null,
type = TextMessageType(
body = "**Hello!**",
formatted = null,