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

Fix tests and warnings

Browse source
This commit is contained in:
ganfra 2023-12-14 13:13:11 +01:00
parent bdfc8a6dae
commit 5d91697be0
6 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt
View file

@ -43,9 +43,9 @@ import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTime
import io.element.android.libraries.matrix.test.AN_EVENT_ID import io.element.android.libraries.matrix.test.AN_EVENT_ID
import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
import io.element.android.libraries.matrix.test.room.FakeMatrixRoom import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
import io.element.android.libraries.matrix.test.room.aMessageContent
import io.element.android.libraries.matrix.test.room.anEventTimelineItem
import io.element.android.libraries.matrix.test.timeline.FakeMatrixTimeline import io.element.android.libraries.matrix.test.timeline.FakeMatrixTimeline
import io.element.android.libraries.matrix.test.timeline.aMessageContent
import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
import io.element.android.libraries.matrix.ui.components.aMatrixUserList import io.element.android.libraries.matrix.ui.components.aMatrixUserList
import io.element.android.tests.testutils.WarmUpRule import io.element.android.tests.testutils.WarmUpRule

4
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/history/PollHistoryView.kt
View file

@ -64,9 +64,9 @@ import kotlinx.collections.immutable.ImmutableList
@Composable @Composable
fun PollHistoryView( fun PollHistoryView(
state: PollHistoryState, state: PollHistoryState,
modifier: Modifier = Modifier,
onEditPoll: (EventId) -> Unit, onEditPoll: (EventId) -> Unit,
goBack: () -> Unit, goBack: () -> Unit,
modifier: Modifier = Modifier,
) { ) {
fun onLoadMore() { fun onLoadMore() {
@ -118,7 +118,7 @@ fun PollHistoryView(
HorizontalPager( HorizontalPager(
state = pagerState, state = pagerState,
userScrollEnabled = false, userScrollEnabled = false,
modifier = modifier.fillMaxSize() modifier = Modifier.fillMaxSize()
) { page -> ) { page ->
val filter = PollHistoryFilter.entries[page] val filter = PollHistoryFilter.entries[page]
val pollHistoryItems = state.pollHistoryForFilter(filter) val pollHistoryItems = state.pollHistoryForFilter(filter)

14
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MatrixTimeline.kt
View file

@ -23,11 +23,19 @@ import kotlinx.coroutines.flow.StateFlow
interface MatrixTimeline : AutoCloseable { interface MatrixTimeline : AutoCloseable {
data class PaginationState( data class PaginationState(
val isBackPaginating: Boolean = false, val isBackPaginating: Boolean,
val hasMoreToLoadBackwards: Boolean = true, val hasMoreToLoadBackwards: Boolean,
val beginningOfRoomReached: Boolean = false, val beginningOfRoomReached: Boolean,
) { ) {
val canBackPaginate = !isBackPaginating && hasMoreToLoadBackwards val canBackPaginate = !isBackPaginating && hasMoreToLoadBackwards
companion object {
val Initial = PaginationState(
isBackPaginating = false,
hasMoreToLoadBackwards = true,
beginningOfRoomReached = false
)
}
} }
val paginationState: StateFlow<PaginationState> val paginationState: StateFlow<PaginationState>

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/AsyncMatrixTimeline.kt
View file

@ -47,7 +47,7 @@ class AsyncMatrixTimeline(
MutableStateFlow(emptyList()) MutableStateFlow(emptyList())
private val _paginationState = MutableStateFlow( private val _paginationState = MutableStateFlow(
MatrixTimeline.PaginationState() MatrixTimeline.PaginationState.Initial
) )
private val timeline = coroutineScope.async(context = dispatcher, start = CoroutineStart.LAZY) { private val timeline = coroutineScope.async(context = dispatcher, start = CoroutineStart.LAZY) {
timelineProvider() timelineProvider()

2
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustMatrixTimeline.kt
View file

@ -72,7 +72,7 @@ class RustMatrixTimeline(
MutableStateFlow(emptyList()) MutableStateFlow(emptyList())
private val _paginationState = MutableStateFlow( private val _paginationState = MutableStateFlow(
MatrixTimeline.PaginationState() MatrixTimeline.PaginationState.Initial
) )
private val encryptedHistoryPostProcessor = TimelineEncryptedHistoryPostProcessor( private val encryptedHistoryPostProcessor = TimelineEncryptedHistoryPostProcessor(

2
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/TimelineEncryptedHistoryPostProcessorTest.kt
View file

@ -20,7 +20,7 @@ import com.google.common.truth.Truth.assertThat
import io.element.android.libraries.matrix.api.timeline.MatrixTimeline import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
import io.element.android.libraries.matrix.test.room.anEventTimelineItem import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.test.StandardTestDispatcher import kotlinx.coroutines.test.StandardTestDispatcher
import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.TestScope