Skip to content

Commit ce03ca5

Browse files
authored
Merge pull request #3472 from element-hq/feature/bma/sdkUpgrade2
Upgrade Rust sdk to 0.2.45
2 parents ff29461 + 265c60a commit ce03ca5

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jsoup = "org.jsoup:jsoup:1.18.1"
162162
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
163163
molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
164164
timber = "com.jakewharton.timber:timber:5.0.1"
165-
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.44"
165+
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.45"
166166
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
167167
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
168168
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,8 @@ class RustMatrixClient(
272272
.filter(predicate)
273273
.first()
274274
.first()
275+
// Ensure that the room is ready
276+
.also { client.awaitRoomRemoteEcho(it.roomId.value) }
275277
}
276278
}
277279

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/call/DefaultElementCallBaseUrlProviderTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ class DefaultElementCallBaseUrlProviderTest {
9191
private fun createElementWellKnown(widgetUrl: String): ElementWellKnown {
9292
return ElementWellKnown(
9393
call = ElementCallWellKnown(
94-
widgetUrl = widgetUrl
95-
)
94+
widgetUrl = widgetUrl,
95+
),
96+
registrationHelperUrl = null,
9697
)
9798
}
9899
}

0 commit comments

Comments
 (0)