From 52d0b826f494e2c19e2b2b8818f853ac0b03596f Mon Sep 17 00:00:00 2001
From: Florian Renaud <florianr@element.io>
Date: Tue, 24 Jan 2023 15:47:36 +0100
Subject: [PATCH] Use named arguments for clarity

---
 .../sdk/internal/crypto/tasks/RedactEventTask.kt     |  6 +++++-
 .../session/room/send/LocalEchoEventFactory.kt       |  6 +++++-
 .../internal/session/room/send/RedactEventWorker.kt  | 12 ++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
index 5ebaadb1b5..c1018053eb 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt
@@ -52,7 +52,11 @@ internal class DefaultRedactEventTask @Inject constructor(
                     txId = params.txID,
                     roomId = params.roomId,
                     eventId = params.eventId,
-                    body = EventRedactBody(params.reason, withRelations, withRelations)
+                    body = EventRedactBody(
+                            reason = params.reason,
+                            withRelations = withRelations,
+                            withRelationsUnstable = withRelations,
+                    )
             )
         }
         return response.eventId
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index 528865910e..e05ece5c10 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -799,7 +799,11 @@ internal class LocalEchoEventFactory @Inject constructor(
     fun createRedactEvent(roomId: String, eventId: String, reason: String?, withRelations: List<String>? = null, additionalContent: Content? = null): Event {
         val localId = LocalEcho.createLocalEchoId()
         val content = if (reason != null || withRelations != null) {
-            EventRedactBody(reason, withRelations, withRelations).toContent().plus(additionalContent.orEmpty())
+            EventRedactBody(
+                    reason = reason,
+                    withRelations = withRelations,
+                    withRelationsUnstable = withRelations,
+            ).toContent().plus(additionalContent.orEmpty())
         } else {
             additionalContent
         }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
index b40a831af0..51ad41a224 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/RedactEventWorker.kt
@@ -69,10 +69,14 @@ internal class RedactEventWorker(context: Context, params: WorkerParameters, ses
         return runCatching {
             executeRequest(globalErrorReceiver) {
                 roomAPI.redactEvent(
-                        params.txID,
-                        params.roomId,
-                        eventId,
-                        EventRedactBody(params.reason, withRelations, withRelations)
+                        txId = params.txID,
+                        roomId = params.roomId,
+                        eventId = eventId,
+                        body = EventRedactBody(
+                                reason = params.reason,
+                                withRelations = withRelations,
+                                withRelationsUnstable = withRelations,
+                        )
                 )
             }
         }.fold(