From bb28fd6e9243b573bd91eee594b3d9b72aa2e02b Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 31 Oct 2025 17:03:54 +0100
Subject: [PATCH] Forward Event error: Log error and use generic error dialog.

---
 features/forward/impl/build.gradle.kts                     | 1 +
 .../features/forward/impl/ForwardMessagesPresenter.kt      | 7 ++++++-
 .../android/features/forward/impl/ForwardMessagesView.kt   | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/features/forward/impl/build.gradle.kts b/features/forward/impl/build.gradle.kts
index de38d25651..0364ffadd8 100644
--- a/features/forward/impl/build.gradle.kts
+++ b/features/forward/impl/build.gradle.kts
@@ -31,6 +31,7 @@ dependencies {
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.roomselect.api)
+    implementation(projects.libraries.uiStrings)
 
     testCommonDependencies(libs, true)
     testImplementation(projects.libraries.matrix.test)
diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
index 63fbb0bc7c..c495bd0dc4 100644
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesPresenter.kt
@@ -23,6 +23,7 @@ import io.element.android.libraries.matrix.api.timeline.TimelineProvider
 import io.element.android.libraries.matrix.api.timeline.getActiveTimeline
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
 @AssistedInject
 class ForwardMessagesPresenter(
@@ -63,7 +64,11 @@ class ForwardMessagesPresenter(
         roomIds: List<RoomId>,
     ) = launch {
         suspend {
-            timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds).getOrThrow()
+            timelineProvider.getActiveTimeline().forwardEvent(eventId, roomIds)
+                .onFailure {
+                    Timber.e(it, "Error while forwarding event")
+                }
+                .getOrThrow()
             roomIds
         }.runCatchingUpdatingState(forwardingActionState)
     }
diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
index 214c795851..3e092c70fa 100644
--- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
+++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesView.kt
@@ -8,11 +8,13 @@
 package io.element.android.features.forward.impl
 
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.ui.strings.CommonStrings
 
 @Composable
 fun ForwardMessagesView(
@@ -24,6 +26,9 @@ fun ForwardMessagesView(
         onSuccess = {
             onForwardSuccess(it)
         },
+        errorMessage = {
+            stringResource(id = CommonStrings.error_unknown)
+        },
         onErrorDismiss = {
             state.eventSink(ForwardMessagesEvents.ClearError)
         },