TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sending quote

Browse Source
This commit is contained in:
Ryan ZHAO 2021-03-09 11:16:43 +11:00
parent 0a7fecfb52
commit 82b8883bb1
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt
View File

@ -84,8 +84,7 @@ class Quote() {
} }
val quotedAttachmentProto = SignalServiceProtos.DataMessage.Quote.QuotedAttachment.newBuilder() val quotedAttachmentProto = SignalServiceProtos.DataMessage.Quote.QuotedAttachment.newBuilder()
quotedAttachmentProto.contentType = attachment.contentType quotedAttachmentProto.contentType = attachment.contentType
val fileName = attachment.fileName?.get() if (attachment.fileName.isPresent) quotedAttachmentProto.fileName = attachment.fileName.get()
fileName?.let { quotedAttachmentProto.fileName = fileName }
quotedAttachmentProto.thumbnail = Attachment.createAttachmentPointer(attachment) quotedAttachmentProto.thumbnail = Attachment.createAttachmentPointer(attachment)
try { try {
quoteProto.addAttachments(quotedAttachmentProto.build()) quoteProto.addAttachments(quotedAttachmentProto.build())

16
libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
View File

@ -81,25 +81,13 @@ class VisibleMessage : Message() {
// Text // Text
text?.let { dataMessage.body = text } text?.let { dataMessage.body = text }
// Quote // Quote
val quotedAttachmentID = quote?.attachmentID
quotedAttachmentID?.let {
val index = attachmentIDs.indexOf(quotedAttachmentID)
if (index >= 0) { attachmentIDs.removeAt(index) }
}
val quote = quote
quote?.let { quote?.let {
val quoteProto = quote.toProto() val quoteProto = it.toProto()
if (quoteProto != null) dataMessage.quote = quoteProto if (quoteProto != null) dataMessage.quote = quoteProto
} }
//Link preview //Link preview
val linkPreviewAttachmentID = linkPreview?.attachmentID
linkPreviewAttachmentID?.let {
val index = attachmentIDs.indexOf(quotedAttachmentID)
if (index >= 0) { attachmentIDs.removeAt(index) }
}
val linkPreview = linkPreview
linkPreview?.let { linkPreview?.let {
val linkPreviewProto = linkPreview.toProto() val linkPreviewProto = it.toProto()
linkPreviewProto?.let { linkPreviewProto?.let {
dataMessage.addAllPreview(listOf(linkPreviewProto)) dataMessage.addAllPreview(listOf(linkPreviewProto))
} }