ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-03 06:55:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into julioromano/poll_history_entry_point

Browse Source
This commit is contained in:
Benoit Marty
2023-12-14 16:58:23 +01:00
committed by GitHub
parent ac7dd355aa e725747ea3
commit 664e8b6d5b
24 changed files with 219 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
+3 -6
View File
@@ -242,7 +242,6 @@ class MessagesFlowNode @AssistedInject constructor(
backstack.push(navTarget)
}
is TimelineItemVideoContent -> {
val mediaSource = event.content.videoSource
val navTarget = NavTarget.MediaViewer(
mediaInfo = MediaInfo(
name = event.content.body,
@@ -250,13 +249,12 @@ class MessagesFlowNode @AssistedInject constructor(
formattedFileSize = event.content.formattedFileSize,
fileExtension = event.content.fileExtension
),
mediaSource = mediaSource,
mediaSource = event.content.videoSource,
thumbnailSource = event.content.thumbnailSource,
)
backstack.push(navTarget)
}
is TimelineItemFileContent -> {
val mediaSource = event.content.fileSource
val navTarget = NavTarget.MediaViewer(
mediaInfo = MediaInfo(
name = event.content.body,
@@ -264,13 +262,12 @@ class MessagesFlowNode @AssistedInject constructor(
formattedFileSize = event.content.formattedFileSize,
fileExtension = event.content.fileExtension
),
mediaSource = mediaSource,
mediaSource = event.content.fileSource,
thumbnailSource = event.content.thumbnailSource,
)
backstack.push(navTarget)
}
is TimelineItemAudioContent -> {
val mediaSource = event.content.mediaSource
val navTarget = NavTarget.MediaViewer(
mediaInfo = MediaInfo(
name = event.content.body,
@@ -278,7 +275,7 @@ class MessagesFlowNode @AssistedInject constructor(
formattedFileSize = event.content.formattedFileSize,
fileExtension = event.content.fileExtension
),
mediaSource = mediaSource,
mediaSource = event.content.mediaSource,
thumbnailSource = null,
)
backstack.push(navTarget)
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt
+2 -1
View File
@@ -48,6 +48,7 @@ import io.element.android.libraries.matrix.api.encryption.EncryptionService
import io.element.android.libraries.matrix.api.room.MatrixRoom
import io.element.android.libraries.matrix.api.room.MessageEventType
import io.element.android.libraries.matrix.api.room.roomMembers
import io.element.android.libraries.matrix.api.timeline.ReceiptType
import io.element.android.libraries.matrix.api.timeline.item.event.TimelineItemEventOrigin
import io.element.android.libraries.matrix.api.verification.SessionVerificationService
import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
@@ -233,7 +234,7 @@ class TimelinePresenter @AssistedInject constructor(
if (eventId != null && firstVisibleIndex <= lastReadReceiptIndex.value && eventId != lastReadReceiptId.value) {
lastReadReceiptIndex.value = firstVisibleIndex
lastReadReceiptId.value = eventId
timeline.sendReadReceipt(eventId)
timeline.sendReadReceipt(eventId = eventId, receiptType = ReceiptType.READ)
}
}