Merge branch 'develop' into feature/bma/mediaForward

# Conflicts: # appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
2025-10-29 12:41:58 +01:00 · 2025-10-29 12:41:58 +01:00 · f75a2cc12c
commit f75a2cc12c
parent bf26a8b93c 1aaf363f5f
43 changed files with 399 additions and 190 deletions
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt
@ -17,4 +17,6 @@ sealed class QrLoginException : Exception() {
    data object SlidingSyncNotAvailable : QrLoginException()
    data object OtherDeviceNotSignedIn : QrLoginException()
    data object Unknown : QrLoginException()
+    data object CheckCodeAlreadySent : QrLoginException()
+    data object CheckCodeCannotBeSent : QrLoginException()
 }