From 621165d2c0bdd72d654476cfc8f88b02459319b6 Mon Sep 17 00:00:00 2001 From: Valere Date: Tue, 23 Apr 2024 11:33:16 +0200 Subject: [PATCH 1/2] Add a new Expected UTD cause for membership --- .../java/im/vector/app/features/analytics/plan/Error.kt | 6 ++++++ schemas/Error.json | 1 + types/swift/Error.swift | 2 ++ 3 files changed, 9 insertions(+) diff --git a/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/Error.kt b/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/Error.kt index 98553b9..0f96822 100644 --- a/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/Error.kt +++ b/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/Error.kt @@ -78,6 +78,12 @@ data class Error( enum class Name { + /** + * E2EE domain error. Decryption failed for a message sent before you + * were in the room (shared history visibility). + */ + ExpectedDueToMembership, + /** * E2EE domain error. Decryption failed for a message sent before the * device logged in, and key backup is not enabled. diff --git a/schemas/Error.json b/schemas/Error.json index f0d2c7e..3a2de50 100644 --- a/schemas/Error.json +++ b/schemas/Error.json @@ -21,6 +21,7 @@ {"const": "OlmUnspecifiedError", "description": "E2EE domain error. Any other decryption error (missing field, format errors...)."}, {"const": "UnknownError", "description": "E2EE domain error. Decryption failed due to unknown error."}, {"const": "HistoricalMessage", "description": "E2EE domain error. Decryption failed for a message sent before the device logged in, and key backup is not enabled."}, + {"const": "ExpectedDueToMembership", "description": "E2EE domain error. Decryption failed for a message sent before you were in the room (shared history visibility)."}, {"const": "VoipUserHangup", "description": "VOIP domain error. The user hung up the call."}, {"const": "VoipIceFailed", "description": "VOIP domain error. ICE negotiation failed."}, {"const": "VoipInviteTimeout", "description": "VOIP domain error. The call invite timed out."}, diff --git a/types/swift/Error.swift b/types/swift/Error.swift index a0700b8..bef750e 100644 --- a/types/swift/Error.swift +++ b/types/swift/Error.swift @@ -66,6 +66,8 @@ extension AnalyticsEvent { } public enum Name: String { + /// E2EE domain error. Decryption failed for a message sent before you were in the room (shared history visibility). + case ExpectedDueToMembership /// E2EE domain error. Decryption failed for a message sent before the device logged in, and key backup is not enabled. case HistoricalMessage /// E2EE domain error. The room key is known but is ratcheted (index > 0). From c1c15d0c1587c73d77704d28a54542772b762796 Mon Sep 17 00:00:00 2001 From: Valere Date: Wed, 24 Apr 2024 11:08:35 +0200 Subject: [PATCH 2/2] udpate ExpectedDueToMembership description --- .../main/java/im/vector/app/features/analytics/plan/Error.kt | 3 ++- schemas/Error.json | 2 +- types/swift/Error.swift | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/Error.kt b/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/Error.kt index 0f96822..868e89d 100644 --- a/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/Error.kt +++ b/kotlin/lib/src/main/java/im/vector/app/features/analytics/plan/Error.kt @@ -80,7 +80,8 @@ data class Error( /** * E2EE domain error. Decryption failed for a message sent before you - * were in the room (shared history visibility). + * were in the room (shared history visibility and support for sharing + * past keys is not available/supported). */ ExpectedDueToMembership, diff --git a/schemas/Error.json b/schemas/Error.json index 3a2de50..ddc0b6f 100644 --- a/schemas/Error.json +++ b/schemas/Error.json @@ -21,7 +21,7 @@ {"const": "OlmUnspecifiedError", "description": "E2EE domain error. Any other decryption error (missing field, format errors...)."}, {"const": "UnknownError", "description": "E2EE domain error. Decryption failed due to unknown error."}, {"const": "HistoricalMessage", "description": "E2EE domain error. Decryption failed for a message sent before the device logged in, and key backup is not enabled."}, - {"const": "ExpectedDueToMembership", "description": "E2EE domain error. Decryption failed for a message sent before you were in the room (shared history visibility)."}, + {"const": "ExpectedDueToMembership", "description": "E2EE domain error. Decryption failed for a message sent before you were in the room (shared history visibility and support for sharing past keys is not available/supported)."}, {"const": "VoipUserHangup", "description": "VOIP domain error. The user hung up the call."}, {"const": "VoipIceFailed", "description": "VOIP domain error. ICE negotiation failed."}, {"const": "VoipInviteTimeout", "description": "VOIP domain error. The call invite timed out."}, diff --git a/types/swift/Error.swift b/types/swift/Error.swift index bef750e..8710643 100644 --- a/types/swift/Error.swift +++ b/types/swift/Error.swift @@ -66,7 +66,7 @@ extension AnalyticsEvent { } public enum Name: String { - /// E2EE domain error. Decryption failed for a message sent before you were in the room (shared history visibility). + /// E2EE domain error. Decryption failed for a message sent before you were in the room (shared history visibility and support for sharing past keys is not available/supported). case ExpectedDueToMembership /// E2EE domain error. Decryption failed for a message sent before the device logged in, and key backup is not enabled. case HistoricalMessage