From 7d6971a9e57326e18bf681ba2e67517ed600b3cc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 16 Oct 2025 15:19:19 +0200
Subject: [PATCH] Add a way to reset the colors.

---
 enterprise                                                | 2 +-
 .../preferences/impl/developer/DeveloperSettingsEvents.kt | 2 +-
 .../impl/developer/DeveloperSettingsPresenter.kt          | 2 +-
 .../preferences/impl/developer/DeveloperSettingsView.kt   | 8 ++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/enterprise b/enterprise
index dc42b35239..5bb4720132 160000
--- a/enterprise
+++ b/enterprise
@@ -1 +1 @@
-Subproject commit dc42b35239830bac7d7f43b10999af5c50d82019
+Subproject commit 5bb47201328b08d1c7d79a20f62268e8a4a51ba9
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsEvents.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsEvents.kt
index cb7a9f5de6..953ed61128 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsEvents.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsEvents.kt
@@ -18,6 +18,6 @@ sealed interface DeveloperSettingsEvents {
     data class SetTracingLogLevel(val logLevel: LogLevelItem) : DeveloperSettingsEvents
     data class ToggleTracingLogPack(val logPack: TraceLogPack, val enabled: Boolean) : DeveloperSettingsEvents
     data class SetShowColorPicker(val show: Boolean) : DeveloperSettingsEvents
-    data class ChangeBrandColor(val color: Color) : DeveloperSettingsEvents
+    data class ChangeBrandColor(val color: Color?) : DeveloperSettingsEvents
     data object ClearCache : DeveloperSettingsEvents
 }
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 cf2147f5bc..7106b53503 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
@@ -144,7 +144,7 @@ class DeveloperSettingsPresenter(
                 }
                 is DeveloperSettingsEvents.ChangeBrandColor -> {
                     showColorPicker = false
-                    val color = event.color.value.toHexString(HexFormat.UpperCase).substring(2, 8)
+                    val color = event.color?.value?.toHexString(HexFormat.UpperCase)?.substring(2, 8)
                     enterpriseService.overrideBrandColor(color)
                 }
                 is DeveloperSettingsEvents.SetShowColorPicker -> {
diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
index 4a9b47c0c9..e00716e2ce 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsView.kt
@@ -112,6 +112,14 @@ fun DeveloperSettingsView(
                         state.eventSink(DeveloperSettingsEvents.SetShowColorPicker(true))
                     }
                 )
+                ListItem(
+                    headlineContent = {
+                        Text("Reset brand color")
+                    },
+                    onClick = {
+                        state.eventSink(DeveloperSettingsEvents.ChangeBrandColor(null))
+                    }
+                )
             }
         }
         PreferenceCategory(title = "Crash") {