Merge pull request #2714 from element-hq/feature/fga/room_list_invites

[Feature] Room list invites

libraries/deeplink/src/main/kotlin/io/element/android/libraries/deeplink/Constants.kt

@@ -18,7 +18,3 @@ package io.element.android.libraries.deeplink
 
 internal const val SCHEME = "elementx"
 internal const val HOST = "open"
-
-object DeepLinkPaths {
-    const val INVITE_LIST = "invites"
-}

libraries/deeplink/src/main/kotlin/io/element/android/libraries/deeplink/DeepLinkCreator.kt

@@ -36,13 +36,4 @@ class DeepLinkCreator @Inject constructor() {
             }
         }
     }
-
-    fun inviteList(sessionId: SessionId): String {
-        return buildString {
-            append("$SCHEME://$HOST/")
-            append(sessionId.value)
-            append("/")
-            append(DeepLinkPaths.INVITE_LIST)
-        }
-    }
 }

libraries/deeplink/src/main/kotlin/io/element/android/libraries/deeplink/DeeplinkData.kt

@@ -29,7 +29,4 @@ sealed interface DeeplinkData {
 
     /** The target is a room, with the given [sessionId], [roomId] and optionally a [threadId]. */
     data class Room(override val sessionId: SessionId, val roomId: RoomId, val threadId: ThreadId?) : DeeplinkData
-
-    /** The target is the invites list, with the given [sessionId]. */
-    data class InviteList(override val sessionId: SessionId) : DeeplinkData
 }

libraries/deeplink/src/main/kotlin/io/element/android/libraries/deeplink/DeeplinkParser.kt

@@ -39,7 +39,6 @@ class DeeplinkParser @Inject constructor() {
 
         return when (val screenPathComponent = pathBits.elementAtOrNull(1)) {
             null -> DeeplinkData.Root(sessionId)
-            DeepLinkPaths.INVITE_LIST -> DeeplinkData.InviteList(sessionId)
             else -> {
                 val roomId = screenPathComponent.let(::RoomId)
                 val threadId = pathBits.elementAtOrNull(2)?.let(::ThreadId)

libraries/deeplink/src/test/kotlin/io/element/android/libraries/deeplink/DeepLinkCreatorTest.kt

@@ -33,11 +33,4 @@ class DeepLinkCreatorTest {
         assertThat(sut.room(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID))
             .isEqualTo("elementx://open/@alice:server.org/!aRoomId:domain/\$aThreadId")
     }
-
-    @Test
-    fun inviteList() {
-        val sut = DeepLinkCreator()
-        assertThat(sut.inviteList(A_SESSION_ID))
-            .isEqualTo("elementx://open/@alice:server.org/invites")
-    }
 }

libraries/deeplink/src/test/kotlin/io/element/android/libraries/deeplink/DeeplinkParserTest.kt

@@ -36,8 +36,6 @@ class DeeplinkParserTest {
             "elementx://open/@alice:server.org/!aRoomId:domain"
         const val A_URI_WITH_ROOM_WITH_THREAD =
             "elementx://open/@alice:server.org/!aRoomId:domain/\$aThreadId"
-        const val A_URI_FOR_INVITE_LIST =
-            "elementx://open/@alice:server.org/invites"
     }
 
     private val sut = DeeplinkParser()
@@ -50,8 +48,6 @@ class DeeplinkParserTest {
             .isEqualTo(DeeplinkData.Room(A_SESSION_ID, A_ROOM_ID, null))
         assertThat(sut.getFromIntent(createIntent(A_URI_WITH_ROOM_WITH_THREAD)))
             .isEqualTo(DeeplinkData.Room(A_SESSION_ID, A_ROOM_ID, A_THREAD_ID))
-        assertThat(sut.getFromIntent(createIntent(A_URI_FOR_INVITE_LIST)))
-            .isEqualTo(DeeplinkData.InviteList(A_SESSION_ID))
     }
 
     @Test

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

@@ -57,6 +57,11 @@ sealed interface RoomListFilter {
      */
     data object Favorite : RoomListFilter
 
+    /**
+     * A filter that matches rooms with Invited membership.
+     */
+    data object Invite : RoomListFilter
+
     /**
      * A filter that matches either Group or People rooms.
      */

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

@@ -17,6 +17,7 @@
 package io.element.android.libraries.matrix.api.roomlist
 
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
@@ -49,6 +50,7 @@ data class RoomSummaryDetails(
     val hasRoomCall: Boolean,
     val isDm: Boolean,
     val isFavorite: Boolean,
+    val currentUserMembership: CurrentUserMembership,
 ) {
     val lastMessageTimestamp = lastMessage?.originServerTs
 }

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

@@ -71,6 +71,7 @@ class RustMatrixClientFactory @Inject constructor(
 
         val syncService = client.syncService()
             .withUtdHook(utdTracker)
+            .withUnifiedInvitesInRoomList(true)
             .finish()
 
         RustMatrixClient(

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

@@ -16,6 +16,7 @@
 
 package io.element.android.libraries.matrix.impl.roomlist
 
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 
@@ -25,21 +26,25 @@ val RoomListFilter.predicate
         is RoomListFilter.Any -> { _: RoomSummary -> true }
         RoomListFilter.None -> { _: RoomSummary -> false }
         RoomListFilter.Category.Group -> { roomSummary: RoomSummary ->
-            roomSummary is RoomSummary.Filled && !roomSummary.details.isDirect
+            roomSummary is RoomSummary.Filled && !roomSummary.details.isDirect && !roomSummary.isInvited()
         }
         RoomListFilter.Category.People -> { roomSummary: RoomSummary ->
-            roomSummary is RoomSummary.Filled && roomSummary.details.isDirect
+            roomSummary is RoomSummary.Filled && roomSummary.details.isDirect && !roomSummary.isInvited()
         }
         RoomListFilter.Favorite -> { roomSummary: RoomSummary ->
-            roomSummary is RoomSummary.Filled && roomSummary.details.isFavorite
+            roomSummary is RoomSummary.Filled && roomSummary.details.isFavorite && !roomSummary.isInvited()
         }
         RoomListFilter.Unread -> { roomSummary: RoomSummary ->
             roomSummary is RoomSummary.Filled &&
+                !roomSummary.isInvited() &&
                 (roomSummary.details.numUnreadNotifications > 0 || roomSummary.details.isMarkedUnread)
         }
         is RoomListFilter.NormalizedMatchRoomName -> { roomSummary: RoomSummary ->
             roomSummary is RoomSummary.Filled && roomSummary.details.name.contains(pattern, ignoreCase = true)
         }
+        RoomListFilter.Invite -> { roomSummary: RoomSummary ->
+            roomSummary.isInvited()
+        }
     }
 
 fun List<RoomSummary>.filter(filter: RoomListFilter): List<RoomSummary> {
@@ -55,3 +60,5 @@ fun List<RoomSummary>.filter(filter: RoomListFilter): List<RoomSummary> {
         else -> filter(filter.predicate)
     }
 }
+
+private fun RoomSummary.isInvited() = this is RoomSummary.Filled && this.details.currentUserMembership == CurrentUserMembership.INVITED

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

@@ -19,6 +19,7 @@ package io.element.android.libraries.matrix.impl.roomlist
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.impl.notificationsettings.RoomNotificationSettingsMapper
+import io.element.android.libraries.matrix.impl.room.map
 import io.element.android.libraries.matrix.impl.room.member.RoomMemberMapper
 import io.element.android.libraries.matrix.impl.room.message.RoomMessageFactory
 import org.matrix.rustcomponents.sdk.RoomInfo
@@ -45,6 +46,7 @@ class RoomSummaryDetailsFactory(private val roomMessageFactory: RoomMessageFacto
             hasRoomCall = roomInfo.hasRoomCall,
             isDm = roomInfo.isDirect && roomInfo.activeMembersCount.toLong() == 2L,
             isFavorite = roomInfo.isFavourite,
+            currentUserMembership = roomInfo.membership.map(),
         )
     }
 }

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/roomlist/RoomListFilterTests.kt

@@ -17,6 +17,7 @@
 package io.element.android.libraries.matrix.impl.roomlist
 
 import com.google.common.truth.Truth.assertThat
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
 import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
@@ -54,6 +55,11 @@ class RoomListFilterTests {
             name = "Room to search"
         )
     )
+    private val invitedRoom = aRoomSummaryFilled(
+        aRoomSummaryDetails(
+            currentUserMembership = CurrentUserMembership.INVITED
+        )
+    )
 
     private val roomSummaries = listOf(
         regularRoom,
@@ -61,7 +67,8 @@ class RoomListFilterTests {
         favoriteRoom,
         markedAsUnreadRoom,
         unreadNotificationRoom,
-        roomToSearch
+        roomToSearch,
+        invitedRoom
     )
 
     @Test
@@ -100,6 +107,12 @@ class RoomListFilterTests {
         assertThat(roomSummaries.filter(filter)).containsExactly(markedAsUnreadRoom, unreadNotificationRoom)
     }
 
+    @Test
+    fun `Room list filter invites`() = runTest {
+        val filter = RoomListFilter.Invite
+        assertThat(roomSummaries.filter(filter)).containsExactly(invitedRoom)
+    }
+
     @Test
     fun `Room list filter normalized match room name`() = runTest {
         val filter = RoomListFilter.NormalizedMatchRoomName("search")

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

@@ -19,6 +19,7 @@ package io.element.android.libraries.matrix.test.room
 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.UserId
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
@@ -40,6 +41,7 @@ fun aRoomSummaryFilled(
     numUnreadMentions: Int = 0,
     numUnreadMessages: Int = 0,
     notificationMode: RoomNotificationMode? = null,
+    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
 ) = RoomSummary.Filled(
     aRoomSummaryDetails(
         roomId = roomId,
@@ -50,6 +52,7 @@ fun aRoomSummaryFilled(
         numUnreadMentions = numUnreadMentions,
         numUnreadMessages = numUnreadMessages,
         notificationMode = notificationMode,
+        currentUserMembership = currentUserMembership,
     )
 )
 
@@ -73,6 +76,7 @@ fun aRoomSummaryDetails(
     hasRoomCall: Boolean = false,
     isDm: Boolean = false,
     isFavorite: Boolean = false,
+    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
 ) = RoomSummaryDetails(
     roomId = roomId,
     name = name,
@@ -89,6 +93,7 @@ fun aRoomSummaryDetails(
     hasRoomCall = hasRoomCall,
     isDm = isDm,
     isFavorite = isFavorite,
+    currentUserMembership = currentUserMembership,
 )
 
 fun aRoomMessage(

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedRoom.kt

@@ -44,6 +44,7 @@ import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Surface
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
 import io.element.android.libraries.matrix.api.room.message.RoomMessage
@@ -118,6 +119,7 @@ fun aRoomSummaryDetails(
     numUnreadNotifications: Int = 0,
     isMarkedUnread: Boolean = false,
     isFavorite: Boolean = false,
+    currentUserMembership: CurrentUserMembership = CurrentUserMembership.JOINED,
 ) = RoomSummaryDetails(
     roomId = roomId,
     name = name,
@@ -134,4 +136,5 @@ fun aRoomSummaryDetails(
     numUnreadNotifications = numUnreadNotifications,
     isMarkedUnread = isMarkedUnread,
     isFavorite = isFavorite,
+    currentUserMembership = currentUserMembership,
 )

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

@@ -30,9 +30,4 @@ interface IntentProvider {
         roomId: RoomId?,
         threadId: ThreadId?,
     ): Intent
-
-    /**
-     * Provide an intent to start the application on the invite list.
-     */
-    fun getInviteListIntent(sessionId: SessionId): Intent
 }

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

@@ -157,7 +157,7 @@ class NotificationCreator @Inject constructor(
 //            .addAction(acceptInvitationActionFactory.create(inviteNotifiableEvent))
             .apply {
                 // Build the pending intent for when the notification is clicked
-                setContentIntent(pendingIntentFactory.createInviteListPendingIntent(inviteNotifiableEvent.sessionId))
+                setContentIntent(pendingIntentFactory.createOpenRoomPendingIntent(inviteNotifiableEvent.sessionId, inviteNotifiableEvent.roomId))
 
                 if (inviteNotifiableEvent.noisy) {
                     // Compat

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

@@ -19,7 +19,6 @@ package io.element.android.libraries.push.impl.notifications.factories
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import androidx.core.app.PendingIntentCompat
 import io.element.android.libraries.androidutils.uri.createIgnoredUri
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.matrix.api.core.EventId
@@ -128,9 +127,4 @@ class PendingIntentFactory @Inject constructor(
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
     }
-
-    fun createInviteListPendingIntent(sessionId: SessionId): PendingIntent {
-        val intent = intentProvider.getInviteListIntent(sessionId)
-        return PendingIntentCompat.getActivity(context, 0, intent, 0, false)!!
-    }
 }

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

@@ -24,6 +24,4 @@ import io.element.android.libraries.push.impl.intent.IntentProvider
 
 class FakeIntentProvider : IntentProvider {
     override fun getViewRoomIntent(sessionId: SessionId, roomId: RoomId?, threadId: ThreadId?) = Intent()
-
-    override fun getInviteListIntent(sessionId: SessionId) = Intent()
 }