generated from element-hq/.github
-
Notifications
You must be signed in to change notification settings - Fork 101
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #291 - Add support for non-decryptable timeline items
- Loading branch information
1 parent
a304e1f
commit bb09837
Showing
11 changed files
with
187 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
ElementX/Sources/Screens/RoomScreen/View/Timeline/EncryptedRoomTimelineView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // | ||
| // Copyright 2022 New Vector Ltd | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct EncryptedRoomTimelineView: View { | ||
| @State private var showEncryptionInfo = false | ||
|
|
||
| let timelineItem: EncryptedRoomTimelineItem | ||
|
|
||
| var body: some View { | ||
| TimelineStyler(timelineItem: timelineItem) { | ||
| Button { | ||
| showEncryptionInfo = !showEncryptionInfo | ||
| } label: { | ||
| HStack(alignment: .top) { | ||
| Image(systemName: "lock.shield") | ||
| .foregroundColor(.red) | ||
| .padding(.top, 1.0) | ||
| if showEncryptionInfo { | ||
| FormattedBodyText(text: encryptionDetails) | ||
| } else { | ||
| FormattedBodyText(text: timelineItem.text) | ||
| } | ||
| } | ||
| .animation(nil, value: showEncryptionInfo) | ||
| } | ||
| } | ||
| .id(timelineItem.id) | ||
| } | ||
|
|
||
| private var encryptionDetails: String { | ||
| switch timelineItem.encryptionType { | ||
| case .unknown: | ||
| return "Unknown" | ||
| case .megolmV1AesSha2(let sessionId): | ||
| return "Megolm session id: \(sessionId)" | ||
| case .olmV1Curve25519AesSha2(let senderKey): | ||
| return "Olm sender key: \(senderKey)" | ||
| } | ||
| } | ||
| } | ||
|
|
||
| struct EncryptedRoomTimelineView_Previews: PreviewProvider { | ||
| static var previews: some View { | ||
| body.preferredColorScheme(.light) | ||
| body.preferredColorScheme(.dark) | ||
| body.preferredColorScheme(.light) | ||
| .timelineStyle(.plain) | ||
| body.preferredColorScheme(.dark) | ||
| .timelineStyle(.plain) | ||
| } | ||
|
|
||
| @ViewBuilder | ||
| static var body: some View { | ||
| VStack(alignment: .leading, spacing: 20.0) { | ||
| EncryptedRoomTimelineView(timelineItem: itemWith(text: "Text", | ||
| timestamp: "Now", | ||
| isOutgoing: false, | ||
| senderId: "Bob")) | ||
|
|
||
| EncryptedRoomTimelineView(timelineItem: itemWith(text: "Some other text", | ||
| timestamp: "Later", | ||
| isOutgoing: true, | ||
| senderId: "Anne")) | ||
| } | ||
| } | ||
|
|
||
| private static func itemWith(text: String, timestamp: String, isOutgoing: Bool, senderId: String) -> EncryptedRoomTimelineItem { | ||
| EncryptedRoomTimelineItem(id: UUID().uuidString, | ||
| text: text, | ||
| encryptionType: .unknown, | ||
| timestamp: timestamp, | ||
| inGroupState: .single, | ||
| isOutgoing: isOutgoing, | ||
| senderId: senderId) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
ElementX/Sources/Services/Timeline/TimelineItems/Items/EncryptedRoomTimelineItem.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // | ||
| // Copyright 2022 New Vector Ltd | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| struct EncryptedRoomTimelineItem: EventBasedTimelineItemProtocol, Identifiable, Equatable { | ||
| enum EncryptionType: Equatable { | ||
| case megolmV1AesSha2(sessionId: String) | ||
| case olmV1Curve25519AesSha2(senderKey: String) | ||
| case unknown | ||
| } | ||
|
|
||
| let id: String | ||
| let text: String | ||
| let encryptionType: EncryptionType | ||
| let timestamp: String | ||
| let inGroupState: TimelineItemInGroupState | ||
| let isOutgoing: Bool | ||
|
|
||
| let senderId: String | ||
| var senderDisplayName: String? | ||
| var senderAvatar: UIImage? | ||
|
|
||
| var properties = RoomTimelineItemProperties() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Added support for non-decryptable timeline items |