deps(sdk) : update rust sdk to 0.2.72 and fix api breaks

element-hq · Dec 18, 2024 · ae03c4c · ae03c4c
2 parents d9a7e13 + abc8a14
commit ae03c4c
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 8 deletions.
diff --git a/...ent/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt b/...ent/android/features/messages/impl/timeline/components/event/TimelineItemEncryptedView.kt
@@ -40,9 +40,12 @@ fun TimelineItemEncryptedView(
                 UtdCause.UnknownDevice -> {
                     CommonStrings.common_unable_to_decrypt_insecure_device to CompoundDrawables.ic_compound_block
                 }
-                UtdCause.HistoricalMessage -> {
+                UtdCause.HistoricalMessageAndBackupIsDisabled -> {
                     CommonStrings.timeline_decryption_failure_historical_event_no_key_backup to CompoundDrawables.ic_compound_block
                 }
+                UtdCause.HistoricalMessageAndDeviceIsUnverified -> {
+                    CommonStrings.timeline_decryption_failure_historical_event_unverified_device to CompoundDrawables.ic_compound_block
+                }
                 UtdCause.WithheldUnverifiedOrInsecureDevice -> {
                     CommonStrings.timeline_decryption_failure_withheld_unverified to CompoundDrawables.ic_compound_block
                 }

diff --git a/...droid/features/messages/impl/timeline/model/event/TimelineItemEncryptedContentProvider.kt b/...droid/features/messages/impl/timeline/model/event/TimelineItemEncryptedContentProvider.kt
@@ -36,7 +36,13 @@ open class TimelineItemEncryptedContentProvider : PreviewParameterProvider<Timel
             aTimelineItemEncryptedContent(
                 data = UnableToDecryptContent.Data.MegolmV1AesSha2(
                     sessionId = "sessionId",
-                    utdCause = UtdCause.HistoricalMessage,
+                    utdCause = UtdCause.HistoricalMessageAndBackupIsDisabled,
+                )
+            ),
+            aTimelineItemEncryptedContent(
+                data = UnableToDecryptContent.Data.MegolmV1AesSha2(
+                    sessionId = "sessionId",
+                    utdCause = UtdCause.HistoricalMessageAndDeviceIsUnverified,
                 )
             ),
             aTimelineItemEncryptedContent(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -173,7 +173,7 @@ jsoup = "org.jsoup:jsoup:1.18.3"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.71"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.72"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

diff --git a/...api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CurrentUserMembership.kt b/...api/src/main/kotlin/io/element/android/libraries/matrix/api/room/CurrentUserMembership.kt
@@ -12,4 +12,5 @@ enum class CurrentUserMembership {
     JOINED,
     LEFT,
     KNOCKED,
+    BANNED,
 }
diff --git a/...i/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/UtdCause.kt b/...i/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/UtdCause.kt
@@ -15,10 +15,17 @@ enum class UtdCause {
     UnknownDevice,
 
     /**
-     * Expected utd because this is a device-historical message and
-     * key storage is not setup or not configured correctly.
+     * We are missing the keys for this event, but it is a "device-historical" message and
+     * there is no key storage backup on the server, presumably because the user has turned it off.
      */
-    HistoricalMessage,
+    HistoricalMessageAndBackupIsDisabled,
+
+    /**
+     * We are missing the keys for this event, but it is a "device-historical"
+     * message, and even though a key storage backup does exist, we can't use
+     * it because our device is unverified.
+     */
+    HistoricalMessageAndDeviceIsUnverified,
 
     /**
      * The key was withheld on purpose because your device is insecure and/or the

diff --git a/...rix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt b/...rix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/analytics/UtdTracker.kt
@@ -27,7 +27,9 @@ class UtdTracker(
             UtdCause.UNKNOWN_DEVICE -> {
                 Error.Name.ExpectedSentByInsecureDevice
             }
-            UtdCause.HISTORICAL_MESSAGE -> Error.Name.HistoricalMessage
+            UtdCause.HISTORICAL_MESSAGE_AND_BACKUP_IS_DISABLED,
+            UtdCause.HISTORICAL_MESSAGE_AND_DEVICE_IS_UNVERIFIED,
+                -> Error.Name.HistoricalMessage
             UtdCause.WITHHELD_FOR_UNVERIFIED_OR_INSECURE_DEVICE -> Error.Name.RoomKeysWithheldForUnverifiedDevice
             UtdCause.WITHHELD_BY_SENDER -> Error.Name.OlmKeysNotSentError
         }

diff --git a/...mpl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt b/...mpl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/MatrixRoomInfoMapper.kt
@@ -67,6 +67,7 @@ fun RustMembership.map(): CurrentUserMembership = when (this) {
     RustMembership.JOINED -> CurrentUserMembership.JOINED
     RustMembership.LEFT -> CurrentUserMembership.LEFT
     Membership.KNOCKED -> CurrentUserMembership.KNOCKED
+    RustMembership.BANNED -> CurrentUserMembership.BANNED
 }
 
 fun RustRoomNotificationMode.map(): RoomNotificationMode = when (this) {

diff --git a/...o/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt b/...o/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt
@@ -145,7 +145,8 @@ private fun RustUtdCause.map(): UtdCause {
         RustUtdCause.VERIFICATION_VIOLATION -> UtdCause.VerificationViolation
         RustUtdCause.UNSIGNED_DEVICE -> UtdCause.UnsignedDevice
         RustUtdCause.UNKNOWN_DEVICE -> UtdCause.UnknownDevice
-        RustUtdCause.HISTORICAL_MESSAGE -> UtdCause.HistoricalMessage
+        RustUtdCause.HISTORICAL_MESSAGE_AND_BACKUP_IS_DISABLED -> UtdCause.HistoricalMessageAndBackupIsDisabled
+        RustUtdCause.HISTORICAL_MESSAGE_AND_DEVICE_IS_UNVERIFIED -> UtdCause.HistoricalMessageAndDeviceIsUnverified
         RustUtdCause.WITHHELD_FOR_UNVERIFIED_OR_INSECURE_DEVICE -> UtdCause.WithheldUnverifiedOrInsecureDevice
         RustUtdCause.WITHHELD_BY_SENDER -> UtdCause.WithheldBySender
     }

diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml
@@ -360,6 +360,7 @@ We do not recommend enabling encryption for rooms that anyone can find and join.
   <string name="test_language_identifier">"en"</string>
   <string name="test_untranslated_default_language_identifier">"en"</string>
   <string name="timeline_decryption_failure_historical_event_no_key_backup">"Historical messages are not available on this device"</string>
+  <string name="timeline_decryption_failure_historical_event_unverified_device">"You need to verify this device for access to historical messages"</string>
   <string name="timeline_decryption_failure_historical_event_user_not_joined">"You don\'t have access to this message"</string>
   <string name="timeline_decryption_failure_unable_to_decrypt">"Unable to decrypt message"</string>
   <string name="timeline_decryption_failure_withheld_unverified">"This message was blocked either because you did not verify your device or because the sender needs to verify your identity."</string>
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,4 +12,5 @@ enum class CurrentUserMembership { @@
         JOINED,
         LEFT,
         KNOCKED,
+        BANNED,
     }