From 00ea5d656ec111b50a27f5acfb75be939e62b5f1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 16 Feb 2026 11:48:18 +0000 Subject: [PATCH 1/3] Update dependency org.matrix.rustcomponents:sdk-android to v26.2.16 --- 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 c3a8d309c95..0046e15e39a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -176,7 +176,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version # https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt # All new features should not be implemented in the pull request that upgrades the version, developers should # only fix API breaks and may add some TODOs. -matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.2.10" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.2.16" # Others coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" } From 80aa507d9d9ad15c52a7482eb911b7635bb381d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 16 Feb 2026 13:01:06 +0100 Subject: [PATCH 2/3] Fix log rotation breaking changes. The new values match iOS (https://github.com/element-hq/element-x-ios/pull/5108/) --- .../rageshake/impl/reporter/DefaultBugReporterTest.kt | 4 ++-- .../matrix/api/tracing/WriteToFilesConfiguration.kt | 4 ++-- .../libraries/matrix/impl/tracing/RustTracingService.kt | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt index c503e497f70..6dd6f81e5f7 100755 --- a/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt +++ b/features/rageshake/impl/src/test/kotlin/io/element/android/features/rageshake/impl/reporter/DefaultBugReporterTest.kt @@ -429,7 +429,7 @@ class DefaultBugReporterTest { assertThat((param as WriteToFilesConfiguration.Enabled).directory).endsWith("/cache/logs/server.org") assertThat((param as WriteToFilesConfiguration.Enabled).filenamePrefix).isEqualTo("logs") assertThat((param as WriteToFilesConfiguration.Enabled).numberOfFiles).isEqualTo(168) - assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo("log") + assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo(".log") } @OptIn(ExperimentalCoroutinesApi::class) @@ -491,7 +491,7 @@ class DefaultBugReporterTest { assertThat((param as WriteToFilesConfiguration.Enabled).directory).endsWith("/cache/logs") assertThat((param as WriteToFilesConfiguration.Enabled).filenamePrefix).isEqualTo("logs") assertThat((param as WriteToFilesConfiguration.Enabled).numberOfFiles).isEqualTo(168) - assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo("log") + assertThat((param as WriteToFilesConfiguration.Enabled).filenameSuffix).isEqualTo(".log") } @Test diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt index 64822845e76..077b88bcf8f 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/tracing/WriteToFilesConfiguration.kt @@ -15,7 +15,7 @@ sealed interface WriteToFilesConfiguration { val filenamePrefix: String, val numberOfFiles: Int?, ) : WriteToFilesConfiguration { - // DO NOT CHANGE: suffix *MUST* be "log" for the rageshake server to not rename the file to something generic - val filenameSuffix = "log" + // DO NOT CHANGE: suffix *MUST* be ".log" for the rageshake server to not rename the file to something generic + val filenameSuffix = ".log" } } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt index 6f235cd0db7..62ed3439b11 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/tracing/RustTracingService.kt @@ -10,6 +10,8 @@ package io.element.android.libraries.matrix.impl.tracing import dev.zacsweers.metro.AppScope import dev.zacsweers.metro.ContributesBinding +import io.element.android.libraries.core.data.ByteUnit +import io.element.android.libraries.core.data.megaBytes import io.element.android.libraries.core.meta.BuildMeta import io.element.android.libraries.matrix.api.tracing.LogLevel import io.element.android.libraries.matrix.api.tracing.TracingConfiguration @@ -49,7 +51,10 @@ private fun WriteToFilesConfiguration.toTracingFileConfiguration(): TracingFileC path = directory, filePrefix = filenamePrefix, fileSuffix = filenameSuffix, - maxFiles = numberOfFiles?.toULong(), + // Have at max 100MB of logs in disk + maxTotalSizeBytes = 100.megaBytes.into(ByteUnit.BYTES).toULong(), + // Store up to 7 days of logs + maxAgeSeconds = (7 * 24 * 60 * 60).toULong(), ) } } From 5271fe662b3b5e3046a9e0c87bb563dec7cc747e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 16 Feb 2026 15:13:28 +0100 Subject: [PATCH 3/3] Fix `aRustRoomInfo()` test fixture --- .../libraries/matrix/impl/fixtures/factories/RoomInfo.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt index 298db5e722b..cb5836c0b30 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt @@ -58,6 +58,7 @@ internal fun aRustRoomInfo( successorRoom: SuccessorRoom? = null, roomVersion: String? = "11", privilegedCreatorsRole: Boolean = false, + serviceMembers: List = emptyList(), ) = RoomInfo( id = id, displayName = displayName, @@ -94,4 +95,5 @@ internal fun aRustRoomInfo( successorRoom = successorRoom, roomVersion = roomVersion, privilegedCreatorsRole = privilegedCreatorsRole, + serviceMembers = serviceMembers, )