From 0dfcd8fc654e8e54c7caa302fb5e6dfe4d9dc455 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 21:58:03 +0000 Subject: [PATCH 1/3] Update dependency org.matrix.rustcomponents:sdk-android to v0.2.71 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2943814b01..119790ca6c 100644 --- 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" } From 7cfee3ed64210b0d721971b0cb1f1c8f0c53b99c Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 12 Dec 2024 00:41:15 +0100 Subject: [PATCH 2/3] Extract UnableToDecryptInfo constructor invocation to a factory. --- .../matrix/impl/analytics/UtdTrackerTest.kt | 12 +++++----- .../fixtures/factories/UnableToDecryptInfo.kt | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt index 994c9a339c..62147d182c 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTrackerTest.kt +++ b/libraries/matrix/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/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt new file mode 100644 index 0000000000..668fd22b30 --- /dev/null +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt @@ -0,0 +1,23 @@ +/* + * 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, +): UnableToDecryptInfo { + return UnableToDecryptInfo( + eventId = eventId, + timeToDecryptMs = timeToDecryptMs, + cause = cause, + ) +} From f2165b5df21cce759ab41d705efaa483810ba88e Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Thu, 12 Dec 2024 00:43:37 +0100 Subject: [PATCH 3/3] Fix compilation issue. --- .../matrix/impl/fixtures/factories/UnableToDecryptInfo.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt index 668fd22b30..4743368472 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/UnableToDecryptInfo.kt @@ -14,10 +14,18 @@ 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, ) }