re-introduce the message detail screen

2025-12-31 05:06:26 +00:00 · 2021-07-13 16:22:10 +10:00
parent 496d9683e3
commit dc33e28826
6 changed files with 238 additions and 2 deletions
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -1251,7 +1251,11 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
    }

    override fun showMessageDetail(messages: Set<MessageRecord>) {
-        TODO("Not yet implemented")
+        val message = messages.first()
+        val intent = Intent(this, MessageDetailActivity::class.java)
+        intent.putExtra(MessageDetailActivity.MESSAGE_TIMESTAMP, message.timestamp)
+        push(intent)
+        endActionMode()
    }

    override fun saveAttachment(messages: Set<MessageRecord>) {
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt
@@ -0,0 +1,118 @@
+package org.thoughtcrime.securesms.conversation.v2
+
+import android.os.Bundle
+import android.view.View
+import android.widget.LinearLayout
+import androidx.annotation.DimenRes
+import kotlinx.android.synthetic.main.activity_conversation_v2_action_bar.*
+import kotlinx.android.synthetic.main.activity_message_detail.*
+import network.loki.messenger.R
+import org.session.libsession.messaging.MessagingModuleConfiguration
+import org.session.libsession.messaging.messages.visible.LinkPreview
+import org.session.libsession.messaging.messages.visible.OpenGroupInvitation
+import org.session.libsession.messaging.messages.visible.Quote
+import org.session.libsession.messaging.messages.visible.VisibleMessage
+import org.session.libsession.messaging.sending_receiving.MessageSender
+import org.session.libsession.messaging.utilities.UpdateMessageData
+import org.session.libsession.utilities.Address
+import org.session.libsession.utilities.ExpirationUtil
+import org.session.libsession.utilities.TextSecurePreferences
+import org.session.libsession.utilities.recipients.Recipient
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.model.MessageRecord
+import org.thoughtcrime.securesms.database.model.MmsMessageRecord
+import org.thoughtcrime.securesms.util.DateUtils
+import java.text.SimpleDateFormat
+import java.util.*
+import kotlin.math.roundToInt
+
+
+class MessageDetailActivity: PassphraseRequiredActionBarActivity() {
+
+    var messageRecord: MessageRecord? = null
+
+    // region Settings
+    companion object {
+        // Extras
+        const val MESSAGE_TIMESTAMP = "message_timestamp"
+    }
+    // endregion
+
+    override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
+        super.onCreate(savedInstanceState, ready)
+        setContentView(R.layout.activity_message_detail)
+        title = resources.getString(R.string.conversation_context__menu_message_details)
+        val timestamp = intent.getLongExtra(MESSAGE_TIMESTAMP, -1L)
+        val author = Address.fromSerialized(TextSecurePreferences.getLocalNumber(this)!!)
+        messageRecord = DatabaseFactory.getMmsSmsDatabase (this).getMessageFor(timestamp, author)
+        updateContent()
+        resend_button.setOnClickListener {
+            resend()
+            finish()
+        }
+    }
+
+    fun updateContent() {
+        val dateLocale = Locale.getDefault()
+        val dateFormatter: SimpleDateFormat = DateUtils.getDetailedDateFormatter(this, dateLocale)
+        sent_time.text = dateFormatter.format(Date(messageRecord!!.dateSent))
+
+        val errorMessage = DatabaseFactory.getLokiMessageDatabase(this).getErrorMessage(messageRecord!!.getId()) ?: "Message failed to send."
+        error_message.text = errorMessage
+
+        if (messageRecord!!.getExpiresIn() <= 0 || messageRecord!!.getExpireStarted() <= 0) {
+            expires_container.visibility = View.GONE
+        } else {
+            expires_container.visibility = View.VISIBLE
+            val elapsed = System.currentTimeMillis() - messageRecord!!.expireStarted
+            val remaining = messageRecord!!.expiresIn - elapsed
+
+            val duration = ExpirationUtil.getExpirationDisplayValue(this, Math.max((remaining / 1000).toInt(), 1))
+            expires_in.text = duration
+        }
+    }
+
+    fun resend() {
+        val messageRecord = messageRecord!!
+        val recipient: Recipient = messageRecord.recipient
+        val message = VisibleMessage()
+        message.id = messageRecord.getId()
+        if (messageRecord.isOpenGroupInvitation) {
+            val openGroupInvitation = OpenGroupInvitation()
+            UpdateMessageData.fromJSON(messageRecord.body)?.let { updateMessageData ->
+                val kind = updateMessageData.kind
+                if (kind is UpdateMessageData.Kind.OpenGroupInvitation) {
+                    openGroupInvitation.name = kind.groupName
+                    openGroupInvitation.url = kind.groupUrl
+                }
+            }
+            message.openGroupInvitation = openGroupInvitation
+        } else {
+            message.text = messageRecord.body
+        }
+        message.sentTimestamp = messageRecord.timestamp
+        if (recipient.isGroupRecipient) {
+            message.groupPublicKey = recipient.address.toGroupString()
+        } else {
+            message.recipient = messageRecord.recipient.address.serialize()
+        }
+        message.threadID = messageRecord.threadId
+        if (messageRecord.isMms) {
+            val mmsMessageRecord = messageRecord as MmsMessageRecord
+            if (mmsMessageRecord.linkPreviews.isNotEmpty()) {
+                message.linkPreview = LinkPreview.from(mmsMessageRecord.linkPreviews[0])
+            }
+            if (mmsMessageRecord.quote != null) {
+                message.quote = Quote.from(mmsMessageRecord.quote!!.quoteModel)
+            }
+            message.addSignalAttachments(mmsMessageRecord.slideDeck.asAttachments())
+        }
+        val sentTimestamp = message.sentTimestamp
+        val sender = MessagingModuleConfiguration.shared.storage.getUserPublicKey()
+        if (sentTimestamp != null && sender != null) {
+            MessagingModuleConfiguration.shared.storage.markAsSending(sentTimestamp, sender)
+        }
+        MessageSender.send(message, recipient.address)
+    }
+}