From f21ee9d55b216c1be53d4a651cece11dd9aac444 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 29 Oct 2025 11:45:50 +0100 Subject: [PATCH 1/3] Ensure the color has a `#` prefix. --- .../impl/developer/DeveloperSettingsPresenter.kt | 7 ++++++- .../impl/developer/DeveloperSettingsPresenterTest.kt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt index 1e68652e5c8..9e59e80fcf7 100644 --- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt +++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenter.kt @@ -20,6 +20,7 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.runtime.snapshots.SnapshotStateList +import androidx.compose.ui.graphics.toArgb import dev.zacsweers.metro.Inject import io.element.android.features.enterprise.api.EnterpriseService import io.element.android.features.preferences.impl.developer.tracing.toLogLevel @@ -139,7 +140,11 @@ class DeveloperSettingsPresenter( } is DeveloperSettingsEvents.ChangeBrandColor -> coroutineScope.launch { showColorPicker = false - val color = event.color?.value?.toHexString(HexFormat.UpperCase)?.substring(2, 8) + val color = event.color + ?.toArgb() + ?.toHexString(HexFormat.UpperCase) + ?.substring(2, 8) + ?.padStart(7, '#') enterpriseService.overrideBrandColor(sessionId, color) } is DeveloperSettingsEvents.SetShowColorPicker -> { diff --git a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt index b68c01266d0..3b71112f0e4 100644 --- a/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt +++ b/features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsPresenterTest.kt @@ -207,7 +207,7 @@ class DeveloperSettingsPresenterTest { assertThat(awaitItem().showColorPicker).isFalse() skipItems(1) overrideBrandColorResult.assertions().isCalledOnce() - .with(value(A_SESSION_ID), value("00FF00")) + .with(value(A_SESSION_ID), value("#00FF00")) } } From 6ebf926fcd4f52c325115db9b210428411c2058a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 29 Oct 2025 12:25:33 +0100 Subject: [PATCH 2/3] Enable Konsist test. --- .../kotlin/io/element/android/tests/konsist/KonsistDiTest.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistDiTest.kt b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistDiTest.kt index 5f46722a81e..1f3bfce1785 100644 --- a/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistDiTest.kt +++ b/tests/konsist/src/test/kotlin/io/element/android/tests/konsist/KonsistDiTest.kt @@ -15,7 +15,6 @@ import com.lemonappdev.konsist.api.verify.assertTrue import dev.zacsweers.metro.Assisted import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.Inject -import org.junit.Ignore import org.junit.Test class KonsistDiTest { @@ -36,7 +35,6 @@ class KonsistDiTest { } } - @Ignore("Disabled to give time to branch and private module to remove the annotation") @Test fun `class annotated with @ContributesBinding does not need to be annotated with @Inject anymore`() { Konsist From e38c385b738672f06d5a33e3ff1b216dffeeccb3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 29 Oct 2025 12:25:58 +0100 Subject: [PATCH 3/3] Update Ref. --- enterprise | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/enterprise b/enterprise index 19d78b589df..44d20b11fcd 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 19d78b589dfbca08b1e8306bff1a236fa2cdf528 +Subproject commit 44d20b11fcd178f4fa966a8c987409cdf4a96b39