Skip to content

Commit f4afda1

Browse files
authored
Merge pull request #4228 from element-hq/renovate/org.matrix.rustcomponents-sdk-android-0.x
Update dependency org.matrix.rustcomponents:sdk-android to v0.2.77
2 parents 55b3efa + d1b9493 commit f4afda1

File tree

7 files changed

+8
-5
lines changed

7 files changed

+8
-5
lines changed

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jsoup = "org.jsoup:jsoup:1.18.3"
173173
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
174174
molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
175175
timber = "com.jakewharton.timber:timber:5.0.1"
176-
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.76"
176+
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.77"
177177
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
178178
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
179179
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ enum class SyncState {
1212
Running,
1313
Error,
1414
Terminated,
15+
Offline,
1516
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ class RustMatrixClientFactory @Inject constructor(
112112
.useEventCachePersistentStorage(featureFlagService.isFeatureEnabled(FeatureFlags.EventCache))
113113
.roomKeyRecipientStrategy(
114114
strategy = if (featureFlagService.isFeatureEnabled(FeatureFlags.OnlySignedDeviceIsolationMode)) {
115-
CollectStrategy.IdentityBasedStrategy
115+
CollectStrategy.IDENTITY_BASED_STRATEGY
116116
} else {
117-
CollectStrategy.DeviceBasedStrategy(onlyAllowTrustedDevices = false, errorOnVerifiedUserProblem = true)
117+
CollectStrategy.ERROR_ON_VERIFIED_USER_PROBLEM
118118
}
119119
)
120120
.roomDecryptionTrustRequirement(

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ internal fun SyncServiceState.toSyncState(): SyncState {
1616
SyncServiceState.RUNNING -> SyncState.Running
1717
SyncServiceState.TERMINATED -> SyncState.Terminated
1818
SyncServiceState.ERROR -> SyncState.Error
19+
SyncServiceState.OFFLINE -> SyncState.Offline
1920
}
2021
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ class RustTimeline(
179179
updatePaginationStatus(direction) { it.copy(isPaginating = true) }
180180
when (direction) {
181181
Timeline.PaginationDirection.BACKWARDS -> inner.paginateBackwards(PAGINATION_SIZE.toUShort())
182-
Timeline.PaginationDirection.FORWARDS -> inner.focusedPaginateForwards(PAGINATION_SIZE.toUShort())
182+
Timeline.PaginationDirection.FORWARDS -> inner.paginateForwards(PAGINATION_SIZE.toUShort())
183183
}
184184
}.onFailure { error ->
185185
if (error is TimelineException.CannotPaginate) {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ class AppStateMapperKtTest {
1919
assertThat(SyncServiceState.RUNNING.toSyncState()).isEqualTo(SyncState.Running)
2020
assertThat(SyncServiceState.TERMINATED.toSyncState()).isEqualTo(SyncState.Terminated)
2121
assertThat(SyncServiceState.ERROR.toSyncState()).isEqualTo(SyncState.Error)
22+
assertThat(SyncServiceState.OFFLINE.toSyncState()).isEqualTo(SyncState.Offline)
2223
}
2324
}

0 commit comments

Comments
 (0)