Merge branch 'develop' into feature/bma/testEntryPoint

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt

@@ -156,11 +156,6 @@ interface MatrixClient {
      */
     suspend fun currentSlidingSyncVersion(): Result<SlidingSyncVersion>
 
-    /**
-     * Returns the available sliding sync versions for the current user.
-     */
-    suspend fun availableSlidingSyncVersions(): Result<List<SlidingSyncVersion>>
-
     fun canDeactivateAccount(): Boolean
     suspend fun deactivateAccount(password: String, eraseData: Boolean): Result<Unit>
 

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

@@ -49,9 +49,10 @@ sealed interface NotificationContent {
             val senderId: UserId,
         ) : MessageLike
 
-        data class CallNotify(
+        data class RtcNotification(
             val senderId: UserId,
-            val type: CallNotifyType,
+            val type: RtcNotificationType,
+            val expirationTimestampMillis: Long
         ) : MessageLike
 
         data object CallHangup : MessageLike
@@ -118,7 +119,7 @@ sealed interface NotificationContent {
     ) : NotificationContent
 }
 
-enum class CallNotifyType {
+enum class RtcNotificationType {
     RING,
     NOTIFY
 }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MessageEventType.kt

@@ -12,7 +12,7 @@ enum class MessageEventType {
     CALL_INVITE,
     CALL_HANGUP,
     CALL_CANDIDATES,
-    CALL_NOTIFY,
+    RTC_NOTIFICATION,
     KEY_VERIFICATION_READY,
     KEY_VERIFICATION_START,
     KEY_VERIFICATION_CANCEL,

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/EventType.kt

@@ -15,5 +15,6 @@ object EventType {
 
     // Call Events
     const val CALL_INVITE = "m.call.invite"
-    const val CALL_NOTIFY = "m.call.notify"
+
+    const val RTC_NOTIFICATION = "org.matrix.msc4075.rtc.notification"
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt

@@ -688,12 +688,6 @@ class RustMatrixClient(
         })
     }.buffer(Channel.UNLIMITED)
 
-    override suspend fun availableSlidingSyncVersions(): Result<List<SlidingSyncVersion>> = withContext(sessionDispatcher) {
-        runCatchingExceptions {
-            innerClient.availableSlidingSyncVersions().map { it.map() }
-        }
-    }
-
     override suspend fun currentSlidingSyncVersion(): Result<SlidingSyncVersion> = withContext(sessionDispatcher) {
         runCatchingExceptions {
             innerClient.session().slidingSyncVersion.map()

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/TimelineEventToNotificationContentMapper.kt

@@ -10,16 +10,16 @@ package io.element.android.libraries.matrix.impl.notification
 import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.notification.CallNotifyType
 import io.element.android.libraries.matrix.api.notification.NotificationContent
+import io.element.android.libraries.matrix.api.notification.RtcNotificationType
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
 import io.element.android.libraries.matrix.impl.timeline.item.event.EventMessageMapper
 import org.matrix.rustcomponents.sdk.MessageLikeEventContent
-import org.matrix.rustcomponents.sdk.NotifyType
 import org.matrix.rustcomponents.sdk.StateEventContent
 import org.matrix.rustcomponents.sdk.TimelineEvent
 import org.matrix.rustcomponents.sdk.TimelineEventType
 import org.matrix.rustcomponents.sdk.use
+import org.matrix.rustcomponents.sdk.RtcNotificationType as SdkRtcNotificationType
 
 class TimelineEventToNotificationContentMapper {
     fun map(timelineEvent: TimelineEvent): Result<NotificationContent> {
@@ -78,7 +78,11 @@ private fun MessageLikeEventContent.toContent(senderId: UserId): NotificationCon
             MessageLikeEventContent.CallCandidates -> NotificationContent.MessageLike.CallCandidates
             MessageLikeEventContent.CallHangup -> NotificationContent.MessageLike.CallHangup
             MessageLikeEventContent.CallInvite -> NotificationContent.MessageLike.CallInvite(senderId)
-            is MessageLikeEventContent.CallNotify -> NotificationContent.MessageLike.CallNotify(senderId, notifyType.map())
+            is MessageLikeEventContent.RtcNotification -> NotificationContent.MessageLike.RtcNotification(
+                senderId = senderId,
+                type = notificationType.map(),
+                expirationTimestampMillis = expirationTs.toLong()
+            )
             MessageLikeEventContent.KeyVerificationAccept -> NotificationContent.MessageLike.KeyVerificationAccept
             MessageLikeEventContent.KeyVerificationCancel -> NotificationContent.MessageLike.KeyVerificationCancel
             MessageLikeEventContent.KeyVerificationDone -> NotificationContent.MessageLike.KeyVerificationDone
@@ -101,7 +105,7 @@ private fun MessageLikeEventContent.toContent(senderId: UserId): NotificationCon
     }
 }
 
-private fun NotifyType.map(): CallNotifyType = when (this) {
-    NotifyType.NOTIFY -> CallNotifyType.NOTIFY
-    NotifyType.RING -> CallNotifyType.RING
+private fun SdkRtcNotificationType.map(): RtcNotificationType = when (this) {
+    SdkRtcNotificationType.NOTIFICATION -> RtcNotificationType.NOTIFY
+    SdkRtcNotificationType.RING -> RtcNotificationType.RING
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventType.kt

@@ -15,7 +15,7 @@ fun MessageEventType.map(): MessageLikeEventType = when (this) {
     MessageEventType.CALL_INVITE -> MessageLikeEventType.CALL_INVITE
     MessageEventType.CALL_HANGUP -> MessageLikeEventType.CALL_HANGUP
     MessageEventType.CALL_CANDIDATES -> MessageLikeEventType.CALL_CANDIDATES
-    MessageEventType.CALL_NOTIFY -> MessageLikeEventType.CALL_NOTIFY
+    MessageEventType.RTC_NOTIFICATION -> MessageLikeEventType.RTC_NOTIFICATION
     MessageEventType.KEY_VERIFICATION_READY -> MessageLikeEventType.KEY_VERIFICATION_READY
     MessageEventType.KEY_VERIFICATION_START -> MessageLikeEventType.KEY_VERIFICATION_START
     MessageEventType.KEY_VERIFICATION_CANCEL -> MessageLikeEventType.KEY_VERIFICATION_CANCEL
@@ -41,7 +41,7 @@ fun MessageLikeEventType.map(): MessageEventType = when (this) {
     MessageLikeEventType.CALL_INVITE -> MessageEventType.CALL_INVITE
     MessageLikeEventType.CALL_HANGUP -> MessageEventType.CALL_HANGUP
     MessageLikeEventType.CALL_CANDIDATES -> MessageEventType.CALL_CANDIDATES
-    MessageLikeEventType.CALL_NOTIFY -> MessageEventType.CALL_NOTIFY
+    MessageLikeEventType.RTC_NOTIFICATION -> MessageEventType.RTC_NOTIFICATION
     MessageLikeEventType.KEY_VERIFICATION_READY -> MessageEventType.KEY_VERIFICATION_READY
     MessageLikeEventType.KEY_VERIFICATION_START -> MessageEventType.KEY_VERIFICATION_START
     MessageLikeEventType.KEY_VERIFICATION_CANCEL -> MessageEventType.KEY_VERIFICATION_CANCEL

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt

@@ -149,7 +149,7 @@ class TimelineEventContentMapper(
                     )
                 }
                 is TimelineItemContent.CallInvite -> LegacyCallInviteContent
-                is TimelineItemContent.CallNotify -> CallNotifyContent
+                is TimelineItemContent.RtcNotification -> CallNotifyContent
             }
         }
     }

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/SpaceRoom.kt

@@ -43,4 +43,5 @@ fun aRustSpaceRoom(
     childrenCount = childrenCount,
     state = state,
     heroes = heroes,
+    via = emptyList()
 )

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventTypeKtTest.kt

@@ -19,7 +19,7 @@ class MessageEventTypeKtTest {
         assertThat(MessageLikeEventType.CALL_INVITE.map()).isEqualTo(MessageEventType.CALL_INVITE)
         assertThat(MessageLikeEventType.CALL_HANGUP.map()).isEqualTo(MessageEventType.CALL_HANGUP)
         assertThat(MessageLikeEventType.CALL_CANDIDATES.map()).isEqualTo(MessageEventType.CALL_CANDIDATES)
-        assertThat(MessageLikeEventType.CALL_NOTIFY.map()).isEqualTo(MessageEventType.CALL_NOTIFY)
+        assertThat(MessageLikeEventType.RTC_NOTIFICATION.map()).isEqualTo(MessageEventType.RTC_NOTIFICATION)
         assertThat(MessageLikeEventType.KEY_VERIFICATION_READY.map()).isEqualTo(MessageEventType.KEY_VERIFICATION_READY)
         assertThat(MessageLikeEventType.KEY_VERIFICATION_START.map()).isEqualTo(MessageEventType.KEY_VERIFICATION_START)
         assertThat(MessageLikeEventType.KEY_VERIFICATION_CANCEL.map()).isEqualTo(MessageEventType.KEY_VERIFICATION_CANCEL)
@@ -46,7 +46,7 @@ class MessageEventTypeKtTest {
         assertThat(MessageEventType.CALL_INVITE.map()).isEqualTo(MessageLikeEventType.CALL_INVITE)
         assertThat(MessageEventType.CALL_HANGUP.map()).isEqualTo(MessageLikeEventType.CALL_HANGUP)
         assertThat(MessageEventType.CALL_CANDIDATES.map()).isEqualTo(MessageLikeEventType.CALL_CANDIDATES)
-        assertThat(MessageEventType.CALL_NOTIFY.map()).isEqualTo(MessageLikeEventType.CALL_NOTIFY)
+        assertThat(MessageEventType.RTC_NOTIFICATION.map()).isEqualTo(MessageLikeEventType.RTC_NOTIFICATION)
         assertThat(MessageEventType.KEY_VERIFICATION_READY.map()).isEqualTo(MessageLikeEventType.KEY_VERIFICATION_READY)
         assertThat(MessageEventType.KEY_VERIFICATION_START.map()).isEqualTo(MessageLikeEventType.KEY_VERIFICATION_START)
         assertThat(MessageEventType.KEY_VERIFICATION_CANCEL.map()).isEqualTo(MessageLikeEventType.KEY_VERIFICATION_CANCEL)

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

@@ -90,7 +90,6 @@ class FakeMatrixClient(
     private val canDeactivateAccountResult: () -> Boolean = { lambdaError() },
     private val deactivateAccountResult: (String, Boolean) -> Result<Unit> = { _, _ -> lambdaError() },
     private val currentSlidingSyncVersionLambda: () -> Result<SlidingSyncVersion> = { lambdaError() },
-    private val availableSlidingSyncVersionsLambda: () -> Result<List<SlidingSyncVersion>> = { lambdaError() },
     private val ignoreUserResult: (UserId) -> Result<Unit> = { lambdaError() },
     private var unIgnoreUserResult: (UserId) -> Result<Unit> = { Result.success(Unit) },
     private val canReportRoomLambda: () -> Boolean = { false },
@@ -339,10 +338,6 @@ class FakeMatrixClient(
         return currentSlidingSyncVersionLambda()
     }
 
-    override suspend fun availableSlidingSyncVersions(): Result<List<SlidingSyncVersion>> {
-        return availableSlidingSyncVersionsLambda()
-    }
-
     override suspend fun canReportRoom(): Boolean {
         return canReportRoomLambda()
     }

libraries/mediaviewer/impl/src/test/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/MediaGalleryPresenterTest.kt

@@ -10,7 +10,9 @@ package io.element.android.libraries.mediaviewer.impl.gallery
 import android.net.Uri
 import app.cash.turbine.ReceiveTurbine
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher
+import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.room.JoinedRoom
 import io.element.android.libraries.matrix.api.timeline.Timeline
@@ -29,6 +31,7 @@ import io.element.android.libraries.mediaviewer.impl.details.MediaBottomSheetSta
 import io.element.android.libraries.mediaviewer.impl.model.aMediaItemImage
 import io.element.android.libraries.mediaviewer.test.FakeLocalMediaActions
 import io.element.android.libraries.mediaviewer.test.FakeLocalMediaFactory
+import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.WarmUpRule
 import io.element.android.tests.testutils.lambda.lambdaRecorder
 import io.element.android.tests.testutils.lambda.value
@@ -147,8 +150,8 @@ class MediaGalleryPresenterTest {
         val presenter = createMediaGalleryPresenter(
             room = FakeJoinedRoom(
                 baseRoom = FakeBaseRoom(
-                sessionId = A_USER_ID,
-                initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
+                    sessionId = A_USER_ID,
+                    initialRoomInfo = aRoomInfo(name = A_ROOM_NAME),
                     canRedactOtherResult = { Result.success(canDeleteOther) },
                 ),
                 createTimelineResult = { Result.success(FakeTimeline()) }
@@ -223,23 +226,122 @@ class MediaGalleryPresenterTest {
     }
 
     @Test
-    fun `present - share item`() = runTest {
+    fun `present - share item - item not found`() = runTest {
         val presenter = createMediaGalleryPresenter()
         presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink(MediaGalleryEvents.Share(AN_EVENT_ID))
         }
-        // TODO Add more test on this part
     }
 
     @Test
-    fun `present - save on disk`() = runTest {
+    fun `present - share item - item found`() = runTest {
+        val mediaGalleryDataSource = FakeMediaGalleryDataSource(
+            startLambda = { },
+        )
+        mediaGalleryDataSource.emitGroupedMediaItems(
+            AsyncData.Success(
+                aGroupedMediaItems(
+                    imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),
+                    fileItems = emptyList(),
+                )
+            )
+        )
+        val presenter = createMediaGalleryPresenter(
+            mediaGalleryDataSource = mediaGalleryDataSource,
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.eventSink(MediaGalleryEvents.Share(AN_EVENT_ID))
+            val finalState = awaitItem()
+            assertThat(finalState.snackbarMessage).isNull()
+        }
+    }
+
+    @Test
+    fun `present - share item - item found - download error`() = runTest {
+        val mediaGalleryDataSource = FakeMediaGalleryDataSource(
+            startLambda = { },
+        )
+        mediaGalleryDataSource.emitGroupedMediaItems(
+            AsyncData.Success(
+                aGroupedMediaItems(
+                    imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),
+                    fileItems = emptyList(),
+                )
+            )
+        )
+        val presenter = createMediaGalleryPresenter(
+            mediaGalleryDataSource = mediaGalleryDataSource,
+            matrixMediaLoader = FakeMatrixMediaLoader().apply { shouldFail = true },
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.eventSink(MediaGalleryEvents.Share(AN_EVENT_ID))
+            skipItems(1)
+            val finalState = awaitItem()
+            assertThat(finalState.snackbarMessage).isInstanceOf(SnackbarMessage::class.java)
+        }
+    }
+
+    @Test
+    fun `present - save on disk - item not found`() = runTest {
         val presenter = createMediaGalleryPresenter()
         presenter.test {
             val initialState = awaitFirstItem()
             initialState.eventSink(MediaGalleryEvents.SaveOnDisk(AN_EVENT_ID))
         }
-        // TODO Add more test on this part
+    }
+
+    @Test
+    fun `present - save on disk - item found`() = runTest {
+        val mediaGalleryDataSource = FakeMediaGalleryDataSource(
+            startLambda = { },
+        )
+        mediaGalleryDataSource.emitGroupedMediaItems(
+            AsyncData.Success(
+                aGroupedMediaItems(
+                    imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),
+                    fileItems = emptyList(),
+                )
+            )
+        )
+        val presenter = createMediaGalleryPresenter(
+            mediaGalleryDataSource = mediaGalleryDataSource,
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.eventSink(MediaGalleryEvents.SaveOnDisk(AN_EVENT_ID))
+            skipItems(1)
+            val finalState = awaitItem()
+            assertThat(finalState.snackbarMessage?.messageResId).isEqualTo(CommonStrings.common_file_saved_on_disk_android)
+        }
+    }
+
+    @Test
+    fun `present - save on disk - item found - download error`() = runTest {
+        val mediaGalleryDataSource = FakeMediaGalleryDataSource(
+            startLambda = { },
+        )
+        mediaGalleryDataSource.emitGroupedMediaItems(
+            AsyncData.Success(
+                aGroupedMediaItems(
+                    imageAndVideoItems = listOf(aMediaItemImage(eventId = AN_EVENT_ID)),
+                    fileItems = emptyList(),
+                )
+            )
+        )
+        val presenter = createMediaGalleryPresenter(
+            mediaGalleryDataSource = mediaGalleryDataSource,
+            matrixMediaLoader = FakeMatrixMediaLoader().apply { shouldFail = true },
+        )
+        presenter.test {
+            val initialState = awaitFirstItem()
+            initialState.eventSink(MediaGalleryEvents.SaveOnDisk(AN_EVENT_ID))
+            skipItems(1)
+            val finalState = awaitItem()
+            assertThat(finalState.snackbarMessage).isInstanceOf(SnackbarMessage::class.java)
+        }
     }
 
     @Test

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/CallNotificationEventResolver.kt

@@ -14,9 +14,9 @@ import io.element.android.libraries.core.extensions.runCatchingExceptions
 import io.element.android.libraries.matrix.api.MatrixClientProvider
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.exception.NotificationResolverException
-import io.element.android.libraries.matrix.api.notification.CallNotifyType
 import io.element.android.libraries.matrix.api.notification.NotificationContent
 import io.element.android.libraries.matrix.api.notification.NotificationData
+import io.element.android.libraries.matrix.api.notification.RtcNotificationType
 import io.element.android.libraries.matrix.api.timeline.item.event.EventType
 import io.element.android.libraries.push.impl.R
 import io.element.android.libraries.push.impl.notifications.model.NotifiableEvent
@@ -58,13 +58,13 @@ class DefaultCallNotificationEventResolver(
         notificationData: NotificationData,
         forceNotify: Boolean
     ): Result<NotifiableEvent> = runCatchingExceptions {
-        val content = notificationData.content as? NotificationContent.MessageLike.CallNotify
+        val content = notificationData.content as? NotificationContent.MessageLike.RtcNotification
             ?: throw NotificationResolverException.UnknownError("content is not a call notify")
 
         val previousRingingCallStatus = appForegroundStateService.hasRingingCall.value
         // We need the sync service working to get the updated room info
         val isRoomCallActive = runCatchingExceptions {
-            if (content.type == CallNotifyType.RING) {
+            if (content.type == RtcNotificationType.RING) {
                 appForegroundStateService.updateHasRingingCall(true)
 
                 val client = clientProvider.getOrRestore(
@@ -90,7 +90,7 @@ class DefaultCallNotificationEventResolver(
         }.getOrDefault(false)
 
         notificationData.run {
-            if (content.type == CallNotifyType.RING && isRoomCallActive && !forceNotify) {
+            if (content.type == RtcNotificationType.RING && isRoomCallActive && !forceNotify) {
                 NotifiableRingingCallEvent(
                     sessionId = sessionId,
                     roomId = roomId,
@@ -104,9 +104,10 @@ class DefaultCallNotificationEventResolver(
                     description = stringProvider.getString(R.string.notification_incoming_call),
                     senderDisambiguatedDisplayName = getDisambiguatedDisplayName(content.senderId),
                     roomAvatarUrl = roomAvatarUrl,
-                    callNotifyType = content.type,
+                    rtcNotificationType = content.type,
                     senderId = content.senderId,
                     senderAvatarUrl = senderAvatarUrl,
+                    expirationTimestamp = content.expirationTimestampMillis,
                 )
             } else {
                 Timber.d("Event $eventId is call notify but should not ring: $isRoomCallActive, notify: ${content.type}")
@@ -124,7 +125,7 @@ class DefaultCallNotificationEventResolver(
                     roomIsDm = isDm,
                     roomAvatarPath = roomAvatarUrl,
                     senderAvatarPath = senderAvatarUrl,
-                    type = EventType.CALL_NOTIFY,
+                    type = EventType.RTC_NOTIFICATION,
                 )
             }
         }

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolver.kt

@@ -199,7 +199,7 @@ class DefaultNotifiableEventResolver(
                 )
                 ResolvedPushEvent.Event(notifiableMessageEvent)
             }
-            is NotificationContent.MessageLike.CallNotify -> {
+            is NotificationContent.MessageLike.RtcNotification -> {
                 val notifiableEvent = callNotificationEventResolver.resolveEvent(userId, this).getOrThrow()
                 ResolvedPushEvent.Event(notifiableEvent)
             }

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt

@@ -123,7 +123,7 @@ class DefaultNotificationCreator(
 
         val smallIcon = CommonDrawables.ic_notification
 
-        val containsMissedCall = events.any { it.type == EventType.CALL_NOTIFY }
+        val containsMissedCall = events.any { it.type == EventType.RTC_NOTIFICATION }
         val channelId = if (containsMissedCall) {
             notificationChannels.getChannelForIncomingCall(false)
         } else {
@@ -213,8 +213,8 @@ class DefaultNotificationCreator(
                 }
                 setDeleteIntent(pendingIntentFactory.createDismissRoomPendingIntent(roomInfo.sessionId, roomInfo.roomId))
 
-                // If any of the events are of call notify type it means a missed call, set the category to the right value
-                if (events.any { it.type == EventType.CALL_NOTIFY }) {
+                // If any of the events are of rtc notification type it means a missed call, set the category to the right value
+                if (events.any { it.type == EventType.RTC_NOTIFICATION }) {
                     setCategory(NotificationCompat.CATEGORY_MISSED_CALL)
                 }
             }

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/model/NotifiableRingingCallEvent.kt

@@ -11,7 +11,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.notification.CallNotifyType
+import io.element.android.libraries.matrix.api.notification.RtcNotificationType
 
 data class NotifiableRingingCallEvent(
     override val sessionId: SessionId,
@@ -27,6 +27,7 @@ data class NotifiableRingingCallEvent(
     val senderDisambiguatedDisplayName: String?,
     val senderAvatarUrl: String?,
     val roomAvatarUrl: String? = null,
-    val callNotifyType: CallNotifyType,
+    val rtcNotificationType: RtcNotificationType,
     val timestamp: Long,
+    val expirationTimestamp: Long,
 ) : NotifiableEvent

libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandler.kt

@@ -296,6 +296,7 @@ class DefaultPushHandler(
             senderName = notifiableEvent.senderDisambiguatedDisplayName,
             avatarUrl = notifiableEvent.roomAvatarUrl,
             timestamp = notifiableEvent.timestamp,
+            expirationTimestamp = notifiableEvent.expirationTimestamp,
             notificationChannelId = notificationChannels.getChannelForIncomingCall(ring = true),
             textContent = notifiableEvent.description,
         )

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultCallNotificationEventResolverTest.kt

@@ -8,8 +8,8 @@
 package io.element.android.libraries.push.impl.notifications
 
 import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.notification.CallNotifyType
 import io.element.android.libraries.matrix.api.notification.NotificationContent
+import io.element.android.libraries.matrix.api.notification.RtcNotificationType
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_ROOM_NAME
@@ -61,11 +61,12 @@ class DefaultCallNotificationEventResolverTest {
             isUpdated = false,
             senderDisambiguatedDisplayName = A_USER_NAME_2,
             senderAvatarUrl = null,
-            callNotifyType = CallNotifyType.RING,
+            expirationTimestamp = 1567L,
+            rtcNotificationType = RtcNotificationType.RING,
         )
 
         val notificationData = aNotificationData(
-            content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING)
+            content = NotificationContent.MessageLike.RtcNotification(A_USER_ID_2, RtcNotificationType.RING, 1567)
         )
         val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
         assertThat(result.getOrNull()).isEqualTo(expectedResult)
@@ -105,11 +106,11 @@ class DefaultCallNotificationEventResolverTest {
             imageUriString = null,
             imageMimeType = null,
             threadId = null,
-            type = "m.call.notify",
+            type = "org.matrix.msc4075.rtc.notification",
         )
 
         val notificationData = aNotificationData(
-            content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.NOTIFY)
+            content = NotificationContent.MessageLike.RtcNotification(A_USER_ID_2, RtcNotificationType.NOTIFY, 0)
         )
         val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
         assertThat(result.getOrNull()).isEqualTo(expectedResult)
@@ -149,11 +150,11 @@ class DefaultCallNotificationEventResolverTest {
             imageUriString = null,
             imageMimeType = null,
             threadId = null,
-            type = "m.call.notify",
+            type = "org.matrix.msc4075.rtc.notification",
         )
 
         val notificationData = aNotificationData(
-            content = NotificationContent.MessageLike.CallNotify(A_USER_ID_2, CallNotifyType.RING)
+            content = NotificationContent.MessageLike.RtcNotification(A_USER_ID_2, RtcNotificationType.RING, 0)
         )
         val result = resolver.resolveEvent(A_SESSION_ID, notificationData)
         assertThat(result.getOrNull()).isEqualTo(expectedResult)

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotifiableEventResolverTest.kt

@@ -12,9 +12,9 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.exception.NotificationResolverException
 import io.element.android.libraries.matrix.api.media.MediaSource
-import io.element.android.libraries.matrix.api.notification.CallNotifyType
 import io.element.android.libraries.matrix.api.notification.NotificationContent
 import io.element.android.libraries.matrix.api.notification.NotificationData
+import io.element.android.libraries.matrix.api.notification.RtcNotificationType
 import io.element.android.libraries.matrix.api.room.RoomMembershipState
 import io.element.android.libraries.matrix.api.timeline.item.event.AudioMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.EmoteMessageType
@@ -693,9 +693,10 @@ class DefaultNotifiableEventResolverTest {
             notificationResult = Result.success(
                 mapOf(
                     AN_EVENT_ID to Result.success(aNotificationData(
-                        content = NotificationContent.MessageLike.CallNotify(
+                        content = NotificationContent.MessageLike.RtcNotification(
                             A_USER_ID_2,
-                            CallNotifyType.NOTIFY
+                            RtcNotificationType.NOTIFY,
+                            0
                         ),
                     ))
                 )
@@ -719,7 +720,7 @@ class DefaultNotifiableEventResolverTest {
                 isRedacted = false,
                 imageUriString = null,
                 imageMimeType = null,
-                type = EventType.CALL_NOTIFY,
+                type = EventType.RTC_NOTIFICATION,
             )
         )
         callNotificationEventResolver.resolveEventLambda = { _, _, _ -> Result.success(expectedResult.notifiableEvent) }

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/notifications/fixtures/NotifiableEventFixture.kt

@@ -12,7 +12,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.ThreadId
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.notification.CallNotifyType
+import io.element.android.libraries.matrix.api.notification.RtcNotificationType
 import io.element.android.libraries.matrix.api.timeline.item.event.EventType
 import io.element.android.libraries.matrix.test.AN_AVATAR_URL
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
@@ -119,8 +119,9 @@ fun aNotifiableCallEvent(
     senderName: String? = null,
     roomAvatarUrl: String? = AN_AVATAR_URL,
     senderAvatarUrl: String? = AN_AVATAR_URL,
-    callNotifyType: CallNotifyType = CallNotifyType.NOTIFY,
+    rtcNotificationType: RtcNotificationType = RtcNotificationType.NOTIFY,
     timestamp: Long = 0L,
+    expirationTimestamp: Long = 0L,
 ) = NotifiableRingingCallEvent(
     sessionId = sessionId,
     eventId = eventId,
@@ -129,6 +130,7 @@ fun aNotifiableCallEvent(
     editedEventId = null,
     description = "description",
     timestamp = timestamp,
+    expirationTimestamp = expirationTimestamp,
     canBeReplaced = false,
     isRedacted = false,
     isUpdated = false,
@@ -136,5 +138,5 @@ fun aNotifiableCallEvent(
     senderId = senderId,
     roomAvatarUrl = roomAvatarUrl,
     senderAvatarUrl = senderAvatarUrl,
-    callNotifyType = callNotifyType,
+    rtcNotificationType = rtcNotificationType,
 )

libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/push/DefaultPushHandlerTest.kt

@@ -20,7 +20,7 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.exception.NotificationResolverException
-import io.element.android.libraries.matrix.api.notification.CallNotifyType
+import io.element.android.libraries.matrix.api.notification.RtcNotificationType
 import io.element.android.libraries.matrix.api.timeline.item.event.EventType
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.AN_EVENT_ID_2
@@ -388,7 +388,7 @@ class DefaultPushHandlerTest {
                     mapOf(
                         request to Result.success(
                             ResolvedPushEvent.Event(
-                                aNotifiableCallEvent(callNotifyType = CallNotifyType.RING, timestamp = Instant.now().toEpochMilli())
+                                aNotifiableCallEvent(rtcNotificationType = RtcNotificationType.RING, timestamp = Instant.now().toEpochMilli())
                             )
                         )
                     )
@@ -440,7 +440,7 @@ class DefaultPushHandlerTest {
             onNotifiableEventsReceived = onNotifiableEventsReceived,
             notifiableEventsResult = { _, _ ->
                 val request = NotificationEventRequest(A_SESSION_ID, A_ROOM_ID, AN_EVENT_ID, A_PUSHER_INFO)
-                Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent(type = EventType.CALL_NOTIFY)))))
+                Result.success(mapOf(request to Result.success(ResolvedPushEvent.Event(aNotifiableMessageEvent(type = EventType.RTC_NOTIFICATION)))))
             },
             incrementPushCounterResult = {},
             pushClientSecret = FakePushClientSecret(