From 15569ef3e8897bf9555972c7dd7fe2773f1010fe Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 25 Aug 2026 10:16:32 +0200
Subject: [PATCH] `RoomAliasResolverEvents` -> `RoomAliasResolverEvent`

---
 ...omAliasResolverEvents.kt => RoomAliasResolverEvent.kt} | 6 +++---
 .../roomaliasresolver/impl/RoomAliasResolverPresenter.kt  | 6 +++---
 .../roomaliasresolver/impl/RoomAliasResolverState.kt      | 2 +-
 .../impl/RoomAliasResolverStatePreviewParam.kt            | 2 +-
 .../roomaliasresolver/impl/RoomAliasResolverView.kt       | 4 ++--
 .../impl/RoomAliasHelperPresenterTest.kt                  | 2 +-
 .../roomaliasresolver/impl/RoomAliasHelperViewTest.kt     | 8 ++++----
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/{RoomAliasResolverEvents.kt => RoomAliasResolverEvent.kt} (67%)

diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvents.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvent.kt
similarity index 67%
rename from features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvents.kt
rename to features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvent.kt
index 11b92ba244..6c528cea14 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvents.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverEvent.kt
@@ -8,7 +8,7 @@
 
 package io.element.android.features.roomaliasresolver.impl
 
-sealed interface RoomAliasResolverEvents {
-    data object Retry : RoomAliasResolverEvents
-    data object DismissError : RoomAliasResolverEvents
+sealed interface RoomAliasResolverEvent {
+    data object Retry : RoomAliasResolverEvent
+    data object DismissError : RoomAliasResolverEvent
 }
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverPresenter.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverPresenter.kt
index 1ec0ce0691..41a49d0fe1 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverPresenter.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverPresenter.kt
@@ -48,10 +48,10 @@ class RoomAliasResolverPresenter(
             resolveAlias(resolveState)
         }
 
-        fun handleEvent(event: RoomAliasResolverEvents) {
+        fun handleEvent(event: RoomAliasResolverEvent) {
             when (event) {
-                RoomAliasResolverEvents.Retry -> coroutineScope.resolveAlias(resolveState)
-                RoomAliasResolverEvents.DismissError -> resolveState.value = AsyncData.Uninitialized
+                RoomAliasResolverEvent.Retry -> coroutineScope.resolveAlias(resolveState)
+                RoomAliasResolverEvent.DismissError -> resolveState.value = AsyncData.Uninitialized
             }
         }
 
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverState.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverState.kt
index 82d13f16a5..1974fdff7c 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverState.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverState.kt
@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.room.alias.ResolvedRoomAlias
 data class RoomAliasResolverState(
     val roomAlias: RoomAlias,
     val resolveState: AsyncData<ResolvedRoomAlias>,
-    val eventSink: (RoomAliasResolverEvents) -> Unit
+    val eventSink: (RoomAliasResolverEvent) -> Unit
 )
 
 sealed class RoomAliasResolverFailures : Exception() {
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverStatePreviewParam.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverStatePreviewParam.kt
index 6f93930b99..1bb4e03a45 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverStatePreviewParam.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverStatePreviewParam.kt
@@ -30,7 +30,7 @@ open class RoomAliasResolverStatePreviewParam : PreviewParameterProvider<RoomAli
 fun aRoomAliasResolverState(
     roomAlias: RoomAlias = A_ROOM_ALIAS,
     resolveState: AsyncData<ResolvedRoomAlias> = AsyncData.Uninitialized,
-    eventSink: (RoomAliasResolverEvents) -> Unit = {}
+    eventSink: (RoomAliasResolverEvent) -> Unit = {}
 ) = RoomAliasResolverState(
     roomAlias = roomAlias,
     resolveState = resolveState,
diff --git a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
index 37960a50e2..dd002814b1 100644
--- a/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
+++ b/features/roomaliasresolver/impl/src/main/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasResolverView.kt
@@ -66,9 +66,9 @@ fun RoomAliasResolverView(
         ResolvedRoomAliasView(
             resolvedRoomAlias = state.resolveState,
             onSuccess = onSuccess,
-            onRetry = { state.eventSink(RoomAliasResolverEvents.Retry) },
+            onRetry = { state.eventSink(RoomAliasResolverEvent.Retry) },
             onDismissError = {
-                state.eventSink(RoomAliasResolverEvents.DismissError)
+                state.eventSink(RoomAliasResolverEvent.DismissError)
                 onBackClick()
             }
         )
diff --git a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperPresenterTest.kt b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperPresenterTest.kt
index a50049446b..d480ffce11 100644
--- a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperPresenterTest.kt
+++ b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperPresenterTest.kt
@@ -91,7 +91,7 @@ class RoomAliasHelperPresenterTest {
             assertThat(awaitItem().resolveState.isLoading()).isTrue()
             val resultState = awaitItem()
             assertThat(resultState.resolveState.errorOrNull()).isEqualTo(AN_EXCEPTION)
-            resultState.eventSink(RoomAliasResolverEvents.Retry)
+            resultState.eventSink(RoomAliasResolverEvent.Retry)
             val retryLoadingState = awaitItem()
             assertThat(retryLoadingState.resolveState.isLoading()).isTrue()
             val retryState = awaitItem()
diff --git a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperViewTest.kt b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperViewTest.kt
index ae33517732..18a97ebb69 100644
--- a/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperViewTest.kt
+++ b/features/roomaliasresolver/impl/src/test/kotlin/io/element/android/features/roomaliasresolver/impl/RoomAliasHelperViewTest.kt
@@ -30,7 +30,7 @@ import org.junit.Test
 class RoomAliasHelperViewTest : RobolectricTest() {
     @Test
     fun `clicking on back invokes the expected callback`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<RoomAliasResolverEvent>(expectEvents = false)
         ensureCalledOnce {
             setRoomAliasResolverView(
                 aRoomAliasResolverState(
@@ -44,7 +44,7 @@ class RoomAliasHelperViewTest : RobolectricTest() {
 
     @Test
     fun `clicking on Retry emits the expected Event`() = runAndroidComposeUiTest {
-        val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>()
+        val eventsRecorder = EventsRecorder<RoomAliasResolverEvent>()
         setRoomAliasResolverView(
             aRoomAliasResolverState(
                 resolveState = AsyncData.Failure(Exception("Error")),
@@ -52,13 +52,13 @@ class RoomAliasHelperViewTest : RobolectricTest() {
             ),
         )
         clickOn(CommonStrings.action_retry)
-        eventsRecorder.assertSingle(RoomAliasResolverEvents.Retry)
+        eventsRecorder.assertSingle(RoomAliasResolverEvent.Retry)
     }
 
     @Test
     fun `success state invokes the expected Callback`() = runAndroidComposeUiTest {
         val result = aResolvedRoomAlias()
-        val eventsRecorder = EventsRecorder<RoomAliasResolverEvents>(expectEvents = false)
+        val eventsRecorder = EventsRecorder<RoomAliasResolverEvent>(expectEvents = false)
         ensureCalledOnceWithParam(result) {
             setRoomAliasResolverView(
                 aRoomAliasResolverState(