swift/Beam
swift/Beam
1
0
Fork 0
mirror of https://github.com/element-hq/element-x-ios.git synced 2025-03-10 21:39:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update sdk to 1.0.78 (#3586)

Browse Source 
* updated sdk

* added cases

* correct error tracking

* right error label
This commit is contained in:
Mauro 2024-12-05 10:55:49 +01:00 committed by GitHub
parent ab2152096d
commit 7cf88a16bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX.xcodeproj/project.pbxproj
View File

@ -8239,7 +8239,7 @@
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
requirement = { requirement = {
kind = exactVersion; kind = exactVersion;
version = 1.0.77; version = 1.0.78;
}; };
}; };
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {

4
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@ -149,8 +149,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/matrix-rust-components-swift", "location" : "https://github.com/element-hq/matrix-rust-components-swift",
"state" : { "state" : {
"revision" : "4e01a9482cfefae4f06c6f3a5a33d21a2bf73d84", "revision" : "b4705d95bd049f1c7d93cff38e2c2ac2d892f23d",
"version" : "1.0.77" "version" : "1.0.78"
} }
}, },
{ {

4
ElementX/Sources/FlowCoordinators/UserSessionFlowCoordinator.swift
View File

@ -395,6 +395,10 @@ class UserSessionFlowCoordinator: FlowCoordinatorProtocol {
analytics.trackError(context: nil, domain: .E2EE, name: .ExpectedDueToMembership, timeToDecryptMillis: timeToDecryptMs) analytics.trackError(context: nil, domain: .E2EE, name: .ExpectedDueToMembership, timeToDecryptMillis: timeToDecryptMs)
case .historicalMessage: case .historicalMessage:
analytics.trackError(context: nil, domain: .E2EE, name: .HistoricalMessage, timeToDecryptMillis: timeToDecryptMs) analytics.trackError(context: nil, domain: .E2EE, name: .HistoricalMessage, timeToDecryptMillis: timeToDecryptMs)
case .withheldForUnverifiedOrInsecureDevice:
analytics.trackError(context: nil, domain: .E2EE, name: .RoomKeysWithheldForUnverifiedDevice, timeToDecryptMillis: timeToDecryptMs)
case .withheldBySender:
analytics.trackError(context: nil, domain: .E2EE, name: .OlmKeysNotSentError, timeToDecryptMillis: timeToDecryptMs)
} }
} }
.store(in: &cancellables) .store(in: &cancellables)

4
ElementX/Sources/Screens/Timeline/View/TimelineItemViews/EncryptedRoomTimelineView.swift
View File

@ -20,7 +20,9 @@ struct EncryptedRoomTimelineView: View {
case .sentBeforeWeJoined, case .sentBeforeWeJoined,
.historicalMessage, .historicalMessage,
.verificationViolation, .verificationViolation,
.insecureDevice: .insecureDevice,
.witheldBySender,
.withheldForUnverifiedOrInsecureDevice:
return \.block return \.block
} }
default: default:

2
ElementX/Sources/Services/Timeline/TimelineItems/Items/Other/EncryptedRoomTimelineItem.swift
View File

@ -20,6 +20,8 @@ struct EncryptedRoomTimelineItem: EventBasedTimelineItemProtocol, Equatable {
case insecureDevice case insecureDevice
case unknown case unknown
case historicalMessage case historicalMessage
case witheldBySender
case withheldForUnverifiedOrInsecureDevice
} }
let id: TimelineItemIdentifier let id: TimelineItemIdentifier

6
ElementX/Sources/Services/Timeline/TimelineItems/RoomTimelineItemFactory.swift
View File

@ -156,6 +156,12 @@ struct RoomTimelineItemFactory: RoomTimelineItemFactoryProtocol {
case .historicalMessage: case .historicalMessage:
encryptionType = .megolmV1AesSha2(sessionID: sessionID, cause: .historicalMessage) encryptionType = .megolmV1AesSha2(sessionID: sessionID, cause: .historicalMessage)
errorLabel = L10n.timelineDecryptionFailureHistoricalEventNoKeyBackup errorLabel = L10n.timelineDecryptionFailureHistoricalEventNoKeyBackup
case .withheldForUnverifiedOrInsecureDevice:
encryptionType = .megolmV1AesSha2(sessionID: sessionID, cause: .withheldForUnverifiedOrInsecureDevice)
errorLabel = L10n.timelineDecryptionFailureWithheldUnverified
case .withheldBySender:
encryptionType = .megolmV1AesSha2(sessionID: sessionID, cause: .witheldBySender)
errorLabel = L10n.timelineDecryptionFailureUnableToDecrypt
} }
case .olmV1Curve25519AesSha2(let senderKey): case .olmV1Curve25519AesSha2(let senderKey):
encryptionType = .olmV1Curve25519AesSha2(senderKey: senderKey) encryptionType = .olmV1Curve25519AesSha2(senderKey: senderKey)

2
project.yml
View File

@ -61,7 +61,7 @@ packages:
# Element/Matrix dependencies # Element/Matrix dependencies
MatrixRustSDK: MatrixRustSDK:
url: https://github.com/element-hq/matrix-rust-components-swift url: https://github.com/element-hq/matrix-rust-components-swift
exactVersion: 1.0.77 exactVersion: 1.0.78
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/element-hq/compound-ios url: https://github.com/element-hq/compound-ios