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

Update rust sdk to 0.1.31: fix build

Browse source
This commit is contained in:
ganfra 2023-07-12 16:50:40 +02:00
parent ec04250a9b
commit 3d0440c580
8 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
View file

@ -97,7 +97,7 @@ internal fun aTimelineItemList(content: TimelineItemEventContent): ImmutableList
}
fun aTimelineItemDaySeparator(): TimelineItem.Virtual {
return TimelineItem.Virtual(UUID.randomUUID().mostSignificantBits, aTimelineItemDaySeparatorModel("Today"))
return TimelineItem.Virtual(UUID.randomUUID().toString(), aTimelineItemDaySeparatorModel("Today"))
}
internal fun aTimelineItemEvent(
@ -112,7 +112,7 @@ internal fun aTimelineItemEvent(
timelineItemReactions: TimelineItemReactions = aTimelineItemReactions(),
): TimelineItem.Event {
return TimelineItem.Event(
id = UUID.randomUUID().mostSignificantBits,
id = UUID.randomUUID().toString(),
eventId = eventId,
transactionId = transactionId,
senderId = UserId("@senderId:domain"),

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

@ -71,7 +71,7 @@ class TimelineItemEventFactory @Inject constructor(
size = AvatarSize.TimelineSender
)
return TimelineItem.Event(
id = currentTimelineItem.uniqueId,
id = currentTimelineItem.uniqueId.toString(),
eventId = currentTimelineItem.eventId,
transactionId = currentTimelineItem.transactionId,
senderId = currentSender,

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemVirtualFactory.kt
View file

@ -31,7 +31,7 @@ class TimelineItemVirtualFactory @Inject constructor(
virtualTimelineItem: MatrixTimelineItem.Virtual,
): TimelineItem.Virtual {
return TimelineItem.Virtual(
id = virtualTimelineItem.uniqueId,
id = virtualTimelineItem.uniqueId.toString(),
model = virtualTimelineItem.computeModel()
)
}

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

@ -32,8 +32,8 @@ import kotlinx.collections.immutable.ImmutableList
sealed interface TimelineItem {
fun identifier(): String = when (this) {
is Event -> id.toString()
is Virtual -> id.toString()
is Event -> id
is Virtual -> id
is GroupedEvents -> id
}
@ -45,13 +45,13 @@ sealed interface TimelineItem {
@Immutable
data class Virtual(
val id: Long,
val id: String,
val model: TimelineItemVirtualModel
) : TimelineItem
@Immutable
data class Event(
val id: Long,
val id: String,
val eventId: EventId? = null,
val transactionId: String? = null,
val senderId: UserId,