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

Merge branch 'develop' into julioromano/poll_history_entry_point

Browse source
This commit is contained in:
ganfra 2023-12-14 15:17:13 +01:00
commit 5ac3f273ea
257 changed files with 916 additions and 1161 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/model/DefaultPollContentStateFactory.kt
View file

@ -69,12 +69,12 @@ class DefaultPollContentStateFactory @Inject constructor(
return PollContentState(
eventId = event.eventId,
isMine = event.isOwn,
question = content.question,
answerItems = answerItems.toImmutableList(),
pollKind = content.kind,
isPollEditable = event.isEditable,
isPollEnded = isPollEnded,
isMine = event.isOwn,
)
}
}

5
features/poll/impl/src/test/kotlin/io/element/android/features/poll/impl/pollcontent/PollContentStateFactoryTest.kt
View file

@ -222,6 +222,7 @@ class PollContentStateFactoryTest {
answers = persistentListOf(A_POLL_ANSWER_1, A_POLL_ANSWER_2, A_POLL_ANSWER_3, A_POLL_ANSWER_4),
votes = votes,
endTime = endTime,
isEdited = false,
)
private fun aPollContentState(
@ -242,9 +243,9 @@ class PollContentStateFactoryTest {
question = question,
answerItems = answerItems.toImmutableList(),
pollKind = pollKind,
isMine = isMine,
isPollEnded = isEnded,
isPollEditable = isEditable,
isPollEnded = isEnded,
isMine = isMine,
)
private fun aPollAnswerItem(