mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-04 20:01:55 +00:00
Merge pull request #4018 from element-hq/renovate/org.matrix.rustcomponents-sdk-android-0.x
Update dependency org.matrix.rustcomponents:sdk-android to v0.2.70
This commit is contained in:
@@ -173,7 +173,7 @@ jsoup = "org.jsoup:jsoup:1.18.1"
|
|||||||
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
|
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
|
||||||
molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
|
molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
|
||||||
timber = "com.jakewharton.timber:timber:5.0.1"
|
timber = "com.jakewharton.timber:timber:5.0.1"
|
||||||
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.69"
|
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.70"
|
||||||
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
|
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
|
||||||
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
|
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
|
||||||
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
|
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }
|
||||||
|
|||||||
+3
@@ -109,6 +109,9 @@ class RustMatrixClientFactory @Inject constructor(
|
|||||||
.addRootCertificates(userCertificatesProvider.provides())
|
.addRootCertificates(userCertificatesProvider.provides())
|
||||||
.autoEnableBackups(true)
|
.autoEnableBackups(true)
|
||||||
.autoEnableCrossSigning(true)
|
.autoEnableCrossSigning(true)
|
||||||
|
// TODO Add a feature flag to enable persistent storage
|
||||||
|
// See https://github.com/matrix-org/matrix-rust-sdk/pull/4396
|
||||||
|
.useEventCachePersistentStorage(false)
|
||||||
.roomKeyRecipientStrategy(
|
.roomKeyRecipientStrategy(
|
||||||
strategy = if (featureFlagService.isFeatureEnabled(FeatureFlags.OnlySignedDeviceIsolationMode)) {
|
strategy = if (featureFlagService.isFeatureEnabled(FeatureFlags.OnlySignedDeviceIsolationMode)) {
|
||||||
CollectStrategy.IdentityBasedStrategy
|
CollectStrategy.IdentityBasedStrategy
|
||||||
|
|||||||
+1
@@ -22,6 +22,7 @@ fun Throwable.mapAuthenticationException(): AuthenticationException {
|
|||||||
is ClientBuildException.SlidingSync -> AuthenticationException.Generic(message)
|
is ClientBuildException.SlidingSync -> AuthenticationException.Generic(message)
|
||||||
is ClientBuildException.WellKnownDeserializationException -> AuthenticationException.Generic(message)
|
is ClientBuildException.WellKnownDeserializationException -> AuthenticationException.Generic(message)
|
||||||
is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
|
is ClientBuildException.WellKnownLookupFailed -> AuthenticationException.Generic(message)
|
||||||
|
is ClientBuildException.EventCache -> AuthenticationException.Generic(message)
|
||||||
}
|
}
|
||||||
else -> AuthenticationException.Generic(message)
|
else -> AuthenticationException.Generic(message)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import org.matrix.rustcomponents.sdk.VirtualTimelineItem as RustVirtualTimelineI
|
|||||||
class VirtualTimelineItemMapper {
|
class VirtualTimelineItemMapper {
|
||||||
fun map(virtualTimelineItem: RustVirtualTimelineItem): VirtualTimelineItem {
|
fun map(virtualTimelineItem: RustVirtualTimelineItem): VirtualTimelineItem {
|
||||||
return when (virtualTimelineItem) {
|
return when (virtualTimelineItem) {
|
||||||
is RustVirtualTimelineItem.DayDivider -> VirtualTimelineItem.DayDivider(virtualTimelineItem.ts.toLong())
|
is RustVirtualTimelineItem.DateDivider -> VirtualTimelineItem.DayDivider(virtualTimelineItem.ts.toLong())
|
||||||
RustVirtualTimelineItem.ReadMarker -> VirtualTimelineItem.ReadMarker
|
RustVirtualTimelineItem.ReadMarker -> VirtualTimelineItem.ReadMarker
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -52,6 +52,8 @@ class AuthenticationExceptionMappingTest {
|
|||||||
.isException<AuthenticationException.Generic>("WellKnown Deserialization")
|
.isException<AuthenticationException.Generic>("WellKnown Deserialization")
|
||||||
assertThat(ClientBuildException.WellKnownLookupFailed("WellKnown Lookup Failed").mapAuthenticationException())
|
assertThat(ClientBuildException.WellKnownLookupFailed("WellKnown Lookup Failed").mapAuthenticationException())
|
||||||
.isException<AuthenticationException.Generic>("WellKnown Lookup Failed")
|
.isException<AuthenticationException.Generic>("WellKnown Lookup Failed")
|
||||||
|
assertThat(ClientBuildException.EventCache("EventCache error").mapAuthenticationException())
|
||||||
|
.isException<AuthenticationException.Generic>("EventCache error")
|
||||||
}
|
}
|
||||||
|
|
||||||
private inline fun <reified T> ThrowableSubject.isException(message: String) {
|
private inline fun <reified T> ThrowableSubject.isException(message: String) {
|
||||||
|
|||||||
+1
@@ -41,6 +41,7 @@ class FakeRustClientBuilder : ClientBuilder(NoPointer) {
|
|||||||
override fun slidingSyncVersionBuilder(versionBuilder: SlidingSyncVersionBuilder) = this
|
override fun slidingSyncVersionBuilder(versionBuilder: SlidingSyncVersionBuilder) = this
|
||||||
override fun userAgent(userAgent: String) = this
|
override fun userAgent(userAgent: String) = this
|
||||||
override fun username(username: String) = this
|
override fun username(username: String) = this
|
||||||
|
override fun useEventCachePersistentStorage(value: Boolean) = this
|
||||||
|
|
||||||
override suspend fun buildWithQrCode(qrCodeData: QrCodeData, oidcConfiguration: OidcConfiguration, progressListener: QrLoginProgressListener): Client {
|
override suspend fun buildWithQrCode(qrCodeData: QrCodeData, oidcConfiguration: OidcConfiguration, progressListener: QrLoginProgressListener): Client {
|
||||||
return FakeRustClient()
|
return FakeRustClient()
|
||||||
|
|||||||
Reference in New Issue
Block a user