change (accept invite) : map Unknown error to AcceptInvite.Failures.InvalidInvite

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/AcceptInvite.kt

@@ -10,16 +10,23 @@ package io.element.android.features.invite.impl
 import com.squareup.anvil.annotations.ContributesBinding
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.features.invite.api.SeenInvitesStore
+import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
+import io.element.android.libraries.matrix.api.exception.ClientException
+import io.element.android.libraries.matrix.api.exception.ErrorKind
 import io.element.android.libraries.matrix.api.room.join.JoinRoom
 import io.element.android.libraries.push.api.notifications.NotificationCleaner
 import javax.inject.Inject
 
 interface AcceptInvite {
     suspend operator fun invoke(roomId: RoomId): Result<RoomId>
+
+    sealed class Failures : Exception() {
+        data object InvalidInvite : Failures()
+    }
 }
 
 @ContributesBinding(SessionScope::class)
@@ -37,6 +44,15 @@ class DefaultAcceptInvite @Inject constructor(
         ).onSuccess {
             notificationCleaner.clearMembershipNotificationForRoom(client.sessionId, roomId)
             seenInvitesStore.markAsUnSeen(roomId)
+        }.mapFailure {
+            if (it is ClientException.MatrixApi) {
+                when (it.kind) {
+                    ErrorKind.Unknown -> AcceptInvite.Failures.InvalidInvite
+                    else -> it
+                }
+            } else {
+                it
+            }
         }.map { roomId }
     }
 }

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt

@@ -34,7 +34,6 @@ import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runUpdatingState
-import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.core.meta.BuildMeta
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -222,13 +221,7 @@ class JoinRoomPresenter @AssistedInject constructor(
                 roomIdOrAlias = roomIdOrAlias,
                 serverNames = serverNames,
                 trigger = trigger
-            ).mapFailure {
+            )
-                if (it is ClientException.MatrixApi && it.kind == ErrorKind.Forbidden) {
-                    JoinRoomFailures.UnauthorizedJoin
-                } else {
-                    it
-                }
-            }
         }
     }
 

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt

@@ -17,6 +17,7 @@ import io.element.android.libraries.matrix.api.core.RoomAlias
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
 import io.element.android.libraries.matrix.api.room.RoomType
+import io.element.android.libraries.matrix.api.room.join.JoinRoom
 import io.element.android.libraries.matrix.ui.model.InviteSender
 
 internal const val MAX_KNOCK_MESSAGE_LENGTH = 500
@@ -36,7 +37,7 @@ data class JoinRoomState(
     val canReportRoom: Boolean,
     val eventSink: (JoinRoomEvents) -> Unit
 ) {
-    val isJoinActionUnauthorized = joinAction is AsyncAction.Failure && joinAction.error is JoinRoomFailures.UnauthorizedJoin
+    val isJoinActionUnauthorized = joinAction is AsyncAction.Failure && joinAction.error is JoinRoom.Failures.UnauthorizedJoin
     val joinAuthorisationStatus = when (contentState) {
         is ContentState.Loaded -> {
             when {
@@ -107,7 +108,3 @@ sealed interface JoinAuthorisationStatus {
     data object Unknown : JoinAuthorisationStatus
     data object Unauthorized : JoinAuthorisationStatus
 }
-
-sealed class JoinRoomFailures : Exception() {
-    data object UnauthorizedJoin : JoinRoomFailures()
-}

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt

@@ -9,8 +9,8 @@ package io.element.android.features.joinroom.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
-import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@@ -21,6 +21,7 @@ import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
 import io.element.android.libraries.matrix.api.exception.ClientException
 import io.element.android.libraries.matrix.api.room.RoomType
+import io.element.android.libraries.matrix.api.room.join.JoinRoom
 import io.element.android.libraries.matrix.ui.model.InviteSender
 
 open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
@@ -44,7 +45,7 @@ open class JoinRoomStateProvider : PreviewParameterProvider<JoinRoomState> {
             ),
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanJoin),
-                joinAction = AsyncAction.Failure(JoinRoomFailures.UnauthorizedJoin)
+                joinAction = AsyncAction.Failure(JoinRoom.Failures.UnauthorizedJoin)
             ),
             aJoinRoomState(
                 contentState = aLoadedContentState(joinAuthorisationStatus = JoinAuthorisationStatus.CanJoin),
@@ -198,6 +199,16 @@ fun aJoinRoomState(
     eventSink = eventSink
 )
 
+internal fun anAcceptDeclineInviteState(
+    acceptAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
+    declineAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
+    eventSink: (AcceptDeclineInviteEvents) -> Unit = {}
+) = AcceptDeclineInviteState(
+    acceptAction = acceptAction,
+    declineAction = declineAction,
+    eventSink = eventSink,
+)
+
 internal fun anInviteSender(
     userId: UserId = UserId("@bob:domain"),
     displayName: String = "Bob",

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt

@@ -8,8 +8,8 @@
 package io.element.android.features.roomlist.impl
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteEvents
 import io.element.android.features.invite.api.acceptdecline.AcceptDeclineInviteState
-import io.element.android.features.invite.api.acceptdecline.anAcceptDeclineInviteState
 import io.element.android.features.leaveroom.api.LeaveRoomState
 import io.element.android.features.leaveroom.api.aLeaveRoomState
 import io.element.android.features.logout.api.direct.DirectLogoutState
@@ -22,9 +22,11 @@ import io.element.android.features.roomlist.impl.model.aRoomListRoomSummary
 import io.element.android.features.roomlist.impl.model.anInviteSender
 import io.element.android.features.roomlist.impl.search.RoomListSearchState
 import io.element.android.features.roomlist.impl.search.aRoomListSearchState
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
+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.user.MatrixUser
 import io.element.android.libraries.push.api.battery.aBatteryOptimizationState
@@ -86,6 +88,16 @@ internal fun aRoomListState(
     eventSink = eventSink,
 )
 
+internal fun anAcceptDeclineInviteState(
+    acceptAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
+    declineAction: AsyncAction<RoomId> = AsyncAction.Uninitialized,
+    eventSink: (AcceptDeclineInviteEvents) -> Unit = {}
+) = AcceptDeclineInviteState(
+    acceptAction = acceptAction,
+    declineAction = declineAction,
+    eventSink = eventSink,
+)
+
 internal fun aRoomListRoomSummaryList(): ImmutableList<RoomListRoomSummary> {
     return persistentListOf(
         aRoomListRoomSummary(

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

@@ -16,4 +16,8 @@ interface JoinRoom {
         serverNames: List<String>,
         trigger: JoinedRoom.Trigger,
     ): Result<Unit>
+
+    sealed class Failures : Exception() {
+        data object UnauthorizedJoin : Failures()
+    }
 }

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

@@ -9,9 +9,12 @@ package io.element.android.libraries.matrix.impl.room.join
 
 import com.squareup.anvil.annotations.ContributesBinding
 import im.vector.app.features.analytics.plan.JoinedRoom
+import io.element.android.libraries.core.extensions.mapFailure
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
+import io.element.android.libraries.matrix.api.exception.ClientException
+import io.element.android.libraries.matrix.api.exception.ErrorKind
 import io.element.android.libraries.matrix.api.room.join.JoinRoom
 import io.element.android.libraries.matrix.impl.analytics.toAnalyticsJoinedRoom
 import io.element.android.services.analytics.api.AnalyticsService
@@ -42,6 +45,15 @@ class DefaultJoinRoom @Inject constructor(
             if (roomInfo != null) {
                 analyticsService.capture(roomInfo.toAnalyticsJoinedRoom(trigger))
             }
+        }.mapFailure {
+            if (it is ClientException.MatrixApi) {
+                when (it.kind) {
+                    ErrorKind.Forbidden -> JoinRoom.Failures.UnauthorizedJoin
+                    else -> it
+                }
+            } else {
+                it
+            }
         }.map { }
     }
 }