Merge branch 'develop' into feature/fga/image_loading

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

@@ -36,6 +36,8 @@ interface MatrixClient : Closeable {
     val mediaLoader: MatrixMediaLoader
     fun getRoom(roomId: RoomId): MatrixRoom?
     fun findDM(userId: UserId): MatrixRoom?
+    suspend fun ignoreUser(userId: UserId): Result<Unit>
+    suspend fun unignoreUser(userId: UserId): Result<Unit>
     suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId>
     suspend fun createDM(userId: UserId): Result<RoomId>
     fun startSync()

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

@@ -16,12 +16,19 @@
 
 package io.element.android.libraries.matrix.api.notification
 
-import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
+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
 
+//TODO add content
 data class NotificationData(
-    val item: MatrixTimelineItem,
-    val title: String,
-    val subtitle: String?,
+    val senderId: UserId,
+    val eventId: EventId,
+    val roomId: RoomId,
+    val senderAvatarUrl: String? = null,
+    val senderDisplayName: String? = null,
+    val roomAvatarUrl: String? = null,
+    val isDirect: Boolean,
+    val isEncrypted: Boolean,
     val isNoisy: Boolean,
-    val avatarUrl: String?,
 )

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

@@ -18,12 +18,15 @@ package io.element.android.libraries.matrix.api.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.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
 import java.io.Closeable
 
 interface MatrixRoom : Closeable {
+    val sessionId: SessionId
     val roomId: RoomId
     val name: String?
     val bestName: String
@@ -36,20 +39,22 @@ interface MatrixRoom : Closeable {
     val isDirect: Boolean
     val isPublic: Boolean
 
-    suspend fun members(): List<RoomMember>
+    /**
+     * The current loaded members as a StateFlow.
+     * Initial value is [MatrixRoomMembersState.Unknown].
+     * To update them you should call [updateMembers].
+     */
+    val membersStateFlow: StateFlow<MatrixRoomMembersState>
 
-    suspend fun memberCount(): Int
-
-    fun getMember(userId: UserId): RoomMember?
-
-    fun getDmMember(): RoomMember?
+    /**
+     * Try to load the room members and update the membersFlow.
+     */
+    suspend fun updateMembers(): Result<Unit>
 
     fun syncUpdateFlow(): Flow<Long>
 
     fun timeline(): MatrixTimeline
 
-    suspend fun fetchMembers(): Result<Unit>
-
     suspend fun userDisplayName(userId: UserId): Result<String?>
 
     suspend fun userAvatarUrl(userId: UserId): Result<String?>

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2023 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.api.room
+
+sealed interface MatrixRoomMembersState {
+    object Unknown : MatrixRoomMembersState
+    data class Pending(val prevRoomMembers: List<RoomMember>? = null) : MatrixRoomMembersState
+    data class Error(val failure: Throwable, val prevRoomMembers: List<RoomMember>? = null) : MatrixRoomMembersState
+    data class Ready(val roomMembers: List<RoomMember>) : MatrixRoomMembersState
+}
+
+fun MatrixRoomMembersState.roomMembers(): List<RoomMember>? {
+    return when (this) {
+        is MatrixRoomMembersState.Ready -> roomMembers
+        is MatrixRoomMembersState.Pending -> prevRoomMembers
+        is MatrixRoomMembersState.Error -> prevRoomMembers
+        else -> null
+    }
+}
+
+

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

@@ -16,11 +16,8 @@
 
 package io.element.android.libraries.matrix.api.room
 
-import android.os.Parcelable
 import io.element.android.libraries.matrix.api.core.UserId
-import kotlinx.parcelize.Parcelize
 
-@Parcelize
 data class RoomMember(
     val userId: UserId,
     val displayName: String?,
@@ -30,7 +27,7 @@ data class RoomMember(
     val powerLevel: Long,
     val normalizedPowerLevel: Long,
     val isIgnored: Boolean,
-) : Parcelable
+)
 
 enum class RoomMembershipState {
     BAN, INVITE, JOIN, KNOCK, LEAVE