Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4909 from element-hq/feature/fga/invalid-invite

Browse source 
Change : handle invalid invite error
This commit is contained in:
ganfra 2025-06-20 18:42:09 +02:00 • committed by GitHub
commit 0a4d32f3d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 121 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -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 { }
}
}

1
libraries/ui-strings/src/main/res/values/localazy.xml
View file

@ -333,6 +333,7 @@ Are you sure you want to continue?"</string>
<string name="error_failed_loading_messages">"Failed loading messages"</string>
<string name="error_failed_locating_user">"%1$s could not access your location. Please try again later."</string>
<string name="error_failed_uploading_voice_message">"Failed to upload your voice message."</string>
<string name="error_invalid_invite">"The room no longer exists or the invite is no longer valid."</string>
<string name="error_message_not_found">"Message not found"</string>
<string name="error_missing_location_auth_android">"%1$s does not have permission to access your location. You can enable access in Settings."</string>
<string name="error_missing_location_rationale_android">"%1$s does not have permission to access your location. Enable access below."</string>