Merge pull request #4024 from element-hq/renovate/org.matrix.rustcomp…

…onents-sdk-android-0.x Update dependency org.matrix.rustcomponents:sdk-android to v0.2.71
element-hq · Dec 12, 2024 · a665517 · a665517
2 parents 5515c93 + 307b761
commit a665517
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -173,7 +173,7 @@ jsoup = "org.jsoup:jsoup:1.18.1"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.70"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.71"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", 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" }

diff --git a/...impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt b/...impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt
@@ -9,10 +9,10 @@ package io.element.android.libraries.matrix.impl.analytics
 
 import com.google.common.truth.Truth.assertThat
 import im.vector.app.features.analytics.plan.Error
+import io.element.android.libraries.matrix.impl.fixtures.factories.aRustUnableToDecryptInfo
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.services.analytics.test.FakeAnalyticsService
 import org.junit.Test
-import org.matrix.rustcomponents.sdk.UnableToDecryptInfo
 import uniffi.matrix_sdk_crypto.UtdCause
 
 class UtdTrackerTest {
@@ -21,7 +21,7 @@ class UtdTrackerTest {
         val fakeAnalyticsService = FakeAnalyticsService()
         val sut = UtdTracker(fakeAnalyticsService)
         sut.onUtd(
-            UnableToDecryptInfo(
+            aRustUnableToDecryptInfo(
                 eventId = AN_EVENT_ID.value,
                 timeToDecryptMs = null,
                 cause = UtdCause.UNKNOWN,
@@ -46,7 +46,7 @@ class UtdTrackerTest {
         val fakeAnalyticsService = FakeAnalyticsService()
         val sut = UtdTracker(fakeAnalyticsService)
         sut.onUtd(
-            UnableToDecryptInfo(
+            aRustUnableToDecryptInfo(
                 eventId = AN_EVENT_ID.value,
                 timeToDecryptMs = 123.toULong(),
                 cause = UtdCause.UNKNOWN,
@@ -71,7 +71,7 @@ class UtdTrackerTest {
         val fakeAnalyticsService = FakeAnalyticsService()
         val sut = UtdTracker(fakeAnalyticsService)
         sut.onUtd(
-            UnableToDecryptInfo(
+            aRustUnableToDecryptInfo(
                 eventId = AN_EVENT_ID.value,
                 timeToDecryptMs = 123.toULong(),
                 cause = UtdCause.SENT_BEFORE_WE_JOINED,
@@ -96,7 +96,7 @@ class UtdTrackerTest {
         val fakeAnalyticsService = FakeAnalyticsService()
         val sut = UtdTracker(fakeAnalyticsService)
         sut.onUtd(
-            UnableToDecryptInfo(
+            aRustUnableToDecryptInfo(
                 eventId = AN_EVENT_ID.value,
                 timeToDecryptMs = 123.toULong(),
                 cause = UtdCause.UNSIGNED_DEVICE,
@@ -119,7 +119,7 @@ class UtdTrackerTest {
         val fakeAnalyticsService = FakeAnalyticsService()
         val sut = UtdTracker(fakeAnalyticsService)
         sut.onUtd(
-            UnableToDecryptInfo(
+            aRustUnableToDecryptInfo(
                 eventId = AN_EVENT_ID.value,
                 timeToDecryptMs = 123.toULong(),
                 cause = UtdCause.VERIFICATION_VIOLATION,

diff --git a/...kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt b/...kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ * Please see LICENSE in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.impl.fixtures.factories
+
+import org.matrix.rustcomponents.sdk.UnableToDecryptInfo
+import uniffi.matrix_sdk_crypto.UtdCause
+
+internal fun aRustUnableToDecryptInfo(
+    eventId: String,
+    timeToDecryptMs: ULong?,
+    cause: UtdCause,
+    eventLocalAgeMillis: Long = 0L,
+    userTrustsOwnIdentity: Boolean = false,
+    senderHomeserver: String = "",
+    ownHomeserver: String = "",
+): UnableToDecryptInfo {
+    return UnableToDecryptInfo(
+        eventId = eventId,
+        timeToDecryptMs = timeToDecryptMs,
+        cause = cause,
+        eventLocalAgeMillis = eventLocalAgeMillis,
+        userTrustsOwnIdentity = userTrustsOwnIdentity,
+        senderHomeserver = senderHomeserver,
+        ownHomeserver = ownHomeserver,
+    )
+}