Merge branch 'develop' into feature/fga/message_queuing

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/notification/NotificationData.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2024 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.matrix.test.notification
+
+import io.element.android.libraries.matrix.api.notification.NotificationContent
+import io.element.android.libraries.matrix.api.notification.NotificationData
+import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+
+fun aNotificationData(
+    senderDisplayName: String?,
+    senderIsNameAmbiguous: Boolean,
+): NotificationData {
+    return NotificationData(
+        eventId = AN_EVENT_ID,
+        roomId = A_ROOM_ID,
+        senderAvatarUrl = null,
+        senderDisplayName = senderDisplayName,
+        senderIsNameAmbiguous = senderIsNameAmbiguous,
+        roomAvatarUrl = null,
+        roomDisplayName = null,
+        isDirect = false,
+        isEncrypted = false,
+        isNoisy = false,
+        timestamp = 0L,
+        content = NotificationContent.MessageLike.RoomEncrypted,
+        hasMention = false,
+    )
+}

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeMatrixRoom.kt

@@ -86,6 +86,7 @@ class FakeMatrixRoom(
     override val liveTimeline: Timeline = FakeTimeline(),
     private var roomPermalinkResult: () -> Result<String> = { Result.success("room link") },
     private var eventPermalinkResult: (EventId) -> Result<String> = { Result.success("event link") },
+    var sendCallNotificationIfNeededResult: () -> Result<Unit> = { Result.success(Unit) },
     canRedactOwn: Boolean = false,
     canRedactOther: Boolean = false,
 ) : MatrixRoom {
@@ -520,6 +521,10 @@ class FakeMatrixRoom(
         theme: String?,
     ): Result<String> = generateWidgetWebViewUrlResult
 
+    override suspend fun sendCallNotificationIfNeeded(): Result<Unit> {
+        return sendCallNotificationIfNeededResult()
+    }
+
     override fun getWidgetDriver(widgetSettings: MatrixWidgetSettings): Result<MatrixWidgetDriver> = getWidgetDriverResult
 
     fun givenRoomMembersState(state: MatrixRoomMembersState) {

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt

@@ -114,7 +114,8 @@ class FakeTimeline(
         body: String,
         htmlBody: String?,
         mentions: List<Mention>,
-    ) -> Result<Unit> = { _, _, _, _ ->
+        fromNotification: Boolean,
+    ) -> Result<Unit> = { _, _, _, _, _ ->
         Result.success(Unit)
     }
 
@@ -123,11 +124,13 @@ class FakeTimeline(
         body: String,
         htmlBody: String?,
         mentions: List<Mention>,
+        fromNotification: Boolean,
     ): Result<Unit> = replyMessageLambda(
         eventId,
         body,
         htmlBody,
-        mentions
+        mentions,
+        fromNotification,
     )
 
     var sendImageLambda: (