Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Only timestamp is usefull, no need to build a Date.

Browse source
This commit is contained in:
Benoit Marty 2025-10-10 10:02:47 +02:00
parent b282e310c3
commit 2b21e12f97
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt
View file

@ -146,10 +146,9 @@ class TimelineItemEventFactory(
senders = reaction.senders senders = reaction.senders
.sortedByDescending { it.timestamp } .sortedByDescending { it.timestamp }
.map { .map {
val date = Date(it.timestamp)
AggregatedReactionSender( AggregatedReactionSender(
senderId = it.senderId, senderId = it.senderId,
timestamp = date, timestamp = it.timestamp,
sentTime = dateFormatter.format( sentTime = dateFormatter.format(
it.timestamp, it.timestamp,
DateFormatterMode.TimeOrDate, DateFormatterMode.TimeOrDate,

5
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionProvider.kt
View file

@ -33,13 +33,14 @@ fun anAggregatedReaction(
val timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT, java.util.Locale.US).apply { val timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT, java.util.Locale.US).apply {
timeZone = TimeZone.getTimeZone("UTC") timeZone = TimeZone.getTimeZone("UTC")
} }
val date = Date(1_689_061_264L) val timestamp = 1_689_061_264L
val date = Date(timestamp)
val senders = buildList { val senders = buildList {
repeat(count) { index -> repeat(count) { index ->
add( add(
AggregatedReactionSender( AggregatedReactionSender(
senderId = if (isHighlighted && index == 0) userId else UserId("@user$index:server.org"), senderId = if (isHighlighted && index == 0) userId else UserId("@user$index:server.org"),
timestamp = date, timestamp = timestamp,
sentTime = timeFormatter.format(date), sentTime = timeFormatter.format(date),
) )
) )

6
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/AggregatedReactionSender.kt
View file

@ -7,16 +7,12 @@
package io.element.android.features.messages.impl.timeline.model package io.element.android.features.messages.impl.timeline.model
import androidx.compose.runtime.Immutable
import io.element.android.libraries.matrix.api.core.UserId import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.api.user.MatrixUser import io.element.android.libraries.matrix.api.user.MatrixUser
import java.util.Date
// Need to be marked as @Immutable for Date
@Immutable
data class AggregatedReactionSender( data class AggregatedReactionSender(
val senderId: UserId, val senderId: UserId,
val timestamp: Date, val timestamp: Long,
val sentTime: String, val sentTime: String,
val user: MatrixUser? = null val user: MatrixUser? = null
) )