Skip to content

Refactor message formatting #1771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SessionHero01 merged 2 commits into from
Dec 11, 2025
Merged

Refactor message formatting #1771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bffddb7
Refactor message formatting
SessionHero01 Dec 10, 2025
d0f6820
PR feedback
SessionHero01 Dec 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ class ConversationAdapter(
viewHolder.view.bind(
message = message,
previous = messageBefore,
threadRecipient = threadRecipientProvider(),
longPress = { onItemLongPress(message, viewHolder.adapterPosition, viewHolder.view) }
)
}
Expand Down
33 changes: 13 additions & 20 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import org.session.libsession.utilities.ThemeUtil
import org.session.libsession.utilities.getColorFromAttr
import org.session.libsession.utilities.isGroup
import org.session.libsession.utilities.isGroupOrCommunity
import org.session.libsession.utilities.recipients.Recipient
import org.session.libsession.utilities.recipients.displayName
import org.thoughtcrime.securesms.auth.LoginStateRepository
import org.thoughtcrime.securesms.conversation.disappearingmessages.DisappearingMessages
Expand Down Expand Up @@ -76,20 +77,28 @@ class ControlMessageView : LinearLayout {
@Inject lateinit var recipientRepository: RecipientRepository
@Inject lateinit var loginStateRepository: LoginStateRepository
@Inject lateinit var threadDatabase: ThreadDatabase
@Inject lateinit var messageFormatter: MessageFormatter

val controlContentView: View get() = binding.controlContentView

init {
layoutParams = RecyclerView.LayoutParams(RecyclerView.LayoutParams.MATCH_PARENT, RecyclerView.LayoutParams.WRAP_CONTENT)
}

fun bind(message: MessageRecord, previous: MessageRecord?, longPress: (() -> Unit)? = null) {
fun bind(message: MessageRecord,
threadRecipient: Recipient,
previous: MessageRecord?,
longPress: (() -> Unit)? = null) {
binding.dateBreakTextView.showDateBreak(message, previous, dateUtils)
binding.iconImageView.isGone = true
binding.expirationTimerView.isGone = true
binding.followSetting.isGone = true

var messageBody: CharSequence = message.getDisplayBody(context)
val messageBody = messageFormatter.formatMessageBody(
context = context,
message = message,
threadRecipient = threadRecipient,
)

binding.root.contentDescription = null
binding.textView.text = messageBody
Expand All @@ -99,9 +108,7 @@ class ControlMessageView : LinearLayout {
binding.apply {
expirationTimerView.isVisible = true

val threadRecipient = DatabaseComponent.get(context).threadDatabase().getRecipientForThreadId(message.threadId)

if (threadRecipient?.isGroup == true) {
if (threadRecipient.isGroupRecipient) {
expirationTimerView.setTimerIcon()
} else {
expirationTimerView.setExpirationTime(message.expireStarted, message.expiresIn)
Expand All @@ -110,7 +117,7 @@ class ControlMessageView : LinearLayout {
followSetting.isVisible = ExpirationConfiguration.isNewConfigEnabled
&& !message.isOutgoing
&& messageContent.expiryMode != (message.individualRecipient?.expiryMode ?: ExpiryMode.NONE)
&& threadRecipient?.isGroupOrCommunity != true
&& !threadRecipient.isGroupOrCommunityRecipient

if (followSetting.isVisible) {
binding.controlContentView.setOnClickListener {
Expand Down Expand Up @@ -138,20 +145,6 @@ class ControlMessageView : LinearLayout {
}
}
message.isMessageRequestResponse -> {
val msgRecipient = message.recipient.address.toString()
val me = loginStateRepository.getLocalNumber()
binding.textView.text = if (me == msgRecipient) { // you accepted the user's request
threadDatabase.getRecipientForThreadId(message.threadId)
?.let { recipientRepository.getRecipientSync(it) }
?.let { recipient -> context.getSubbedCharSequence(
R.string.messageRequestYouHaveAccepted,
NAME_KEY to recipient.displayName()
)
}
} else { // they accepted your request
context.getString(R.string.messageRequestsAccepted)
}

binding.root.contentDescription = context.getString(R.string.AccessibilityId_message_request_config_message)
}
message.isCallLog -> {
Expand Down
Loading