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

Fix API break

Browse source
This commit is contained in:
Benoit Marty 2025-01-29 15:14:38 +01:00
parent 16e378fdb8
commit 03f5ac9a1c
5 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/sync/SyncState.kt
View file

@ -12,4 +12,5 @@ enum class SyncState {
Running, Running,
Error, Error,
Terminated, Terminated,
Offline,
} }

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt
View file

@ -112,9 +112,9 @@ class RustMatrixClientFactory @Inject constructor(
.useEventCachePersistentStorage(featureFlagService.isFeatureEnabled(FeatureFlags.EventCache)) .useEventCachePersistentStorage(featureFlagService.isFeatureEnabled(FeatureFlags.EventCache))
.roomKeyRecipientStrategy( .roomKeyRecipientStrategy(
strategy = if (featureFlagService.isFeatureEnabled(FeatureFlags.OnlySignedDeviceIsolationMode)) { strategy = if (featureFlagService.isFeatureEnabled(FeatureFlags.OnlySignedDeviceIsolationMode)) {
CollectStrategy.IdentityBasedStrategy CollectStrategy.IDENTITY_BASED_STRATEGY
} else { } else {
CollectStrategy.DeviceBasedStrategy(onlyAllowTrustedDevices = false, errorOnVerifiedUserProblem = true) CollectStrategy.ERROR_ON_VERIFIED_USER_PROBLEM
} }
) )
.roomDecryptionTrustRequirement( .roomDecryptionTrustRequirement(

1
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapper.kt
View file

@ -16,5 +16,6 @@ internal fun SyncServiceState.toSyncState(): SyncState {
SyncServiceState.RUNNING -> SyncState.Running SyncServiceState.RUNNING -> SyncState.Running
SyncServiceState.TERMINATED -> SyncState.Terminated SyncServiceState.TERMINATED -> SyncState.Terminated
SyncServiceState.ERROR -> SyncState.Error SyncServiceState.ERROR -> SyncState.Error
SyncServiceState.OFFLINE -> SyncState.Offline
} }
} }

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

@ -179,7 +179,7 @@ class RustTimeline(
updatePaginationStatus(direction) { it.copy(isPaginating = true) } updatePaginationStatus(direction) { it.copy(isPaginating = true) }
when (direction) { when (direction) {
Timeline.PaginationDirection.BACKWARDS -> inner.paginateBackwards(PAGINATION_SIZE.toUShort()) Timeline.PaginationDirection.BACKWARDS -> inner.paginateBackwards(PAGINATION_SIZE.toUShort())
Timeline.PaginationDirection.FORWARDS -> inner.focusedPaginateForwards(PAGINATION_SIZE.toUShort()) Timeline.PaginationDirection.FORWARDS -> inner.paginateForwards(PAGINATION_SIZE.toUShort())
} }
}.onFailure { error -> }.onFailure { error ->
if (error is TimelineException.CannotPaginate) { if (error is TimelineException.CannotPaginate) {

1
libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/sync/AppStateMapperKtTest.kt
View file

@ -19,5 +19,6 @@ class AppStateMapperKtTest {
assertThat(SyncServiceState.RUNNING.toSyncState()).isEqualTo(SyncState.Running) assertThat(SyncServiceState.RUNNING.toSyncState()).isEqualTo(SyncState.Running)
assertThat(SyncServiceState.TERMINATED.toSyncState()).isEqualTo(SyncState.Terminated) assertThat(SyncServiceState.TERMINATED.toSyncState()).isEqualTo(SyncState.Terminated)
assertThat(SyncServiceState.ERROR.toSyncState()).isEqualTo(SyncState.Error) assertThat(SyncServiceState.ERROR.toSyncState()).isEqualTo(SyncState.Error)
assertThat(SyncServiceState.OFFLINE.toSyncState()).isEqualTo(SyncState.Offline)
} }
} }