Skip to content

Commit

Permalink
Downloading thread last reply media fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomastiminskas
tomastiminskas committed Sep 4, 2023
1 parent 4f90fcb commit c5d3b9b
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 25 deletions.
10 changes: 10 additions & 0 deletions ...s/chats/chat-common/chat-common/src/main/java/chat/sphinx/chat_common/ui/ChatViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,11 @@ abstract class ChatViewModel<ARGS : NavArgs>(
},
onBindDownloadMedia = {
repositoryMedia.downloadMediaIfApplicable(message, sent)
},
onBindThreadDownloadMedia = {
message.thread?.last()?.let { lastReplyMessage ->
repositoryMedia.downloadMediaIfApplicable(lastReplyMessage, sent)
}
}
)
)
Expand Down Expand Up @@ -699,6 +704,11 @@ abstract class ChatViewModel<ARGS : NavArgs>(
},
onBindDownloadMedia = {
repositoryMedia.downloadMediaIfApplicable(message, sent)
},
onBindThreadDownloadMedia = {
message.thread?.last()?.let { lastReplyMessage ->
repositoryMedia.downloadMediaIfApplicable(lastReplyMessage, sent)
}
}
)
)
Expand Down
5 changes: 4 additions & 1 deletion ...c/main/java/chat/sphinx/chat_common/ui/viewstate/messageholder/HolderBindingExtensions.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,10 @@ internal inline fun LayoutMessageHolderBinding.setBubbleThreadLayout(
includeMessageTypeAudioAttachment.root.gone
includeMessageTypeFileAttachment.root.visible

setBubbleFileAttachment(thread.mediaAttachment, true)
setBubbleFileAttachment(
thread.mediaAttachment,
true
)
}
else -> {
constraintMediaThreadContainer.gone
Expand Down
96 changes: 72 additions & 24 deletions ...rc/main/java/chat/sphinx/chat_common/ui/viewstate/messageholder/MessageHolderViewState.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,9 @@ internal sealed class MessageHolderViewState(
private val previewProvider: suspend (link: MessageLinkPreview) -> LayoutState.Bubble.ContainerThird.LinkPreview?,
private val paidTextAttachmentContentProvider: suspend (message: Message) -> LayoutState.Bubble.ContainerThird.Message?,
private val onBindDownloadMedia: () -> Unit,
private val onBindThreadDownloadMedia: () -> Unit,
) {

companion object {
val unsupportedMessageTypes: List<MessageType> by lazy {
listOf(
MessageType.Payment,
MessageType.GroupAction.TribeDelete,
)
}
}

val isPinned: Boolean by lazy(LazyThreadSafetyMode.NONE) {
(message?.uuid?.value == chat.pinedMessage?.value)
}
Expand Down Expand Up @@ -302,12 +294,32 @@ internal sealed class MessageHolderViewState(

val lastReplyAttachment: LayoutState.Bubble.ContainerSecond? =
when(replies.last().messageMedia?.mediaType) {
is MediaType.Image -> { getImageAttachment(replies.last()) }
is MediaType.Video -> { getVideoAttachment(replies.last()) }
is MediaType.Audio -> { getAudioAttachment(replies.last()) }
is MediaType.Pdf -> { getFileAttachment(replies.last())}
is MediaType.Image -> {
getImageAttachment(
replies.last(),
true
)
}
is MediaType.Video -> {
getVideoAttachment(
replies.last(),
true
)
}
is MediaType.Audio -> {
getAudioAttachment(
replies.last(),
true
)
}
is MediaType.Pdf -> {
getFileAttachment(
replies.last(),
true
)
}
else -> { null }
}
}

LayoutState.Bubble.ContainerThird.Thread(
replyCount = replies.size,
Expand Down Expand Up @@ -446,7 +458,8 @@ internal sealed class MessageHolderViewState(
if (message == null){
null
} else {
getFileAttachment(message)
null
// getFileAttachment(message)
}
}

Expand Down Expand Up @@ -667,10 +680,18 @@ internal sealed class MessageHolderViewState(
}
}

private fun getImageAttachment(message: Message): LayoutState.Bubble.ContainerSecond.ImageAttachment? {
private fun getImageAttachment(
message: Message,
isThread: Boolean = false
): LayoutState.Bubble.ContainerSecond.ImageAttachment? {
val pendingPayment = this is Received && message.isPaidPendingMessage

if (!pendingPayment) {
onBindDownloadMedia.invoke()
if (isThread) {
onBindThreadDownloadMedia.invoke()
} else {
onBindDownloadMedia.invoke()
}
}
val isThread = message.thread?.isNotEmpty() ?: false

Expand All @@ -684,7 +705,10 @@ internal sealed class MessageHolderViewState(
}
}

private fun getVideoAttachment(message: Message): LayoutState.Bubble.ContainerSecond.VideoAttachment? {
private fun getVideoAttachment(
message: Message,
isThread: Boolean = false
): LayoutState.Bubble.ContainerSecond.VideoAttachment? {
return message.messageMedia?.let { nnMessageMedia ->
if (nnMessageMedia.mediaType.isVideo) {
nnMessageMedia.localFile?.let { nnFile ->
Expand All @@ -695,7 +719,11 @@ internal sealed class MessageHolderViewState(
// will only be called once when value is lazily initialized upon binding
// data to view.
if (!pendingPayment) {
onBindDownloadMedia.invoke()
if (isThread) {
onBindThreadDownloadMedia.invoke()
} else {
onBindDownloadMedia.invoke()
}
}

LayoutState.Bubble.ContainerSecond.VideoAttachment.FileUnavailable(
Expand All @@ -708,7 +736,10 @@ internal sealed class MessageHolderViewState(
}
}

private fun getFileAttachment(message: Message): LayoutState.Bubble.ContainerSecond.FileAttachment? {
private fun getFileAttachment(
message: Message,
isThread: Boolean = false
): LayoutState.Bubble.ContainerSecond.FileAttachment? {
return message.messageMedia?.let { nnMessageMedia ->
if (nnMessageMedia.mediaType.isPdf || nnMessageMedia.mediaType.isUnknown) {

Expand All @@ -732,7 +763,11 @@ internal sealed class MessageHolderViewState(
val pendingPayment = this is Received && message.isPaidPendingMessage

if (!pendingPayment) {
onBindDownloadMedia.invoke()
if (isThread) {
onBindThreadDownloadMedia.invoke()
} else {
onBindDownloadMedia.invoke()
}
}

LayoutState.Bubble.ContainerSecond.FileAttachment.FileUnavailable(
Expand All @@ -746,7 +781,10 @@ internal sealed class MessageHolderViewState(
}
}

private fun getAudioAttachment(message: Message): LayoutState.Bubble.ContainerSecond.AudioAttachment? {
private fun getAudioAttachment(
message: Message,
isThread: Boolean = false
): LayoutState.Bubble.ContainerSecond.AudioAttachment? {
return message.messageMedia?.let { nnMessageMedia ->
if (nnMessageMedia.mediaType.isAudio) {

Expand All @@ -763,7 +801,11 @@ internal sealed class MessageHolderViewState(
// will only be called once when value is lazily initialized upon binding
// data to view.
if (!pendingPayment) {
onBindDownloadMedia.invoke()
if (isThread) {
onBindThreadDownloadMedia.invoke()
} else {
onBindDownloadMedia.invoke()
}
}

LayoutState.Bubble.ContainerSecond.AudioAttachment.FileUnavailable(
Expand Down Expand Up @@ -791,6 +833,7 @@ internal sealed class MessageHolderViewState(
previewProvider: suspend (link: MessageLinkPreview) -> LayoutState.Bubble.ContainerThird.LinkPreview?,
paidTextMessageContentProvider: suspend (message: Message) -> LayoutState.Bubble.ContainerThird.Message?,
onBindDownloadMedia: () -> Unit,
onBindThreadDownloadMedia: () -> Unit,
) : MessageHolderViewState(
message,
chat,
Expand All @@ -807,6 +850,7 @@ internal sealed class MessageHolderViewState(
previewProvider,
paidTextMessageContentProvider,
onBindDownloadMedia,
onBindThreadDownloadMedia
)

class Received(
Expand All @@ -823,6 +867,7 @@ internal sealed class MessageHolderViewState(
previewProvider: suspend (link: MessageLinkPreview) -> LayoutState.Bubble.ContainerThird.LinkPreview?,
paidTextMessageContentProvider: suspend (message: Message) -> LayoutState.Bubble.ContainerThird.Message?,
onBindDownloadMedia: () -> Unit,
onBindThreadDownloadMedia: () -> Unit,
) : MessageHolderViewState(
message,
chat,
Expand All @@ -839,6 +884,7 @@ internal sealed class MessageHolderViewState(
previewProvider,
paidTextMessageContentProvider,
onBindDownloadMedia,
onBindThreadDownloadMedia,
)

class Separator(
Expand All @@ -865,7 +911,8 @@ internal sealed class MessageHolderViewState(
false,
previewProvider = { null },
paidTextAttachmentContentProvider = { null },
onBindDownloadMedia = {}
onBindDownloadMedia = {},
onBindThreadDownloadMedia = {}
)

class ThreadHeader(
Expand Down Expand Up @@ -893,6 +940,7 @@ internal sealed class MessageHolderViewState(
false,
{ null },
{ null },
{},
{}
) {
fun copy(isExpanded: Boolean = this.isExpanded): ThreadHeader {
Expand Down

0 comments on commit c5d3b9b

Please sign in to comment.