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

Automatically retry decryptions in the active room when the app becomes active again just in case the NSE received keys we're not aware of (#3628)

Browse Source
This commit is contained in:
Stefan Ceriu 2024-12-18 11:10:56 +02:00 committed by GitHub
parent 2a865ce5bf
commit 435dfb8e46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ElementX/Sources/Mocks/Generated/GeneratedMocks.swift
View File

@ -14150,15 +14150,15 @@ class TimelineProxyMock: TimelineProxyProtocol {
}
//MARK: - retryDecryption
var retryDecryptionForUnderlyingCallsCount = 0
var retryDecryptionForCallsCount: Int {
var retryDecryptionSessionIDsUnderlyingCallsCount = 0
var retryDecryptionSessionIDsCallsCount: Int {
get {
if Thread.isMainThread {
return retryDecryptionForUnderlyingCallsCount
return retryDecryptionSessionIDsUnderlyingCallsCount
} else {
var returnValue: Int? = nil
DispatchQueue.main.sync {
returnValue = retryDecryptionForUnderlyingCallsCount
returnValue = retryDecryptionSessionIDsUnderlyingCallsCount
}
return returnValue!
@ -14166,28 +14166,28 @@ class TimelineProxyMock: TimelineProxyProtocol {
}
set {
if Thread.isMainThread {
retryDecryptionForUnderlyingCallsCount = newValue
retryDecryptionSessionIDsUnderlyingCallsCount = newValue
} else {
DispatchQueue.main.sync {
retryDecryptionForUnderlyingCallsCount = newValue
retryDecryptionSessionIDsUnderlyingCallsCount = newValue
}
}
}
}
var retryDecryptionForCalled: Bool {
return retryDecryptionForCallsCount > 0
var retryDecryptionSessionIDsCalled: Bool {
return retryDecryptionSessionIDsCallsCount > 0
}
var retryDecryptionForReceivedSessionID: String?
var retryDecryptionForReceivedInvocations: [String] = []
var retryDecryptionForClosure: ((String) async -> Void)?
var retryDecryptionSessionIDsReceivedSessionIDs: [String]?
var retryDecryptionSessionIDsReceivedInvocations: [[String]?] = []
var retryDecryptionSessionIDsClosure: (([String]?) async -> Void)?
func retryDecryption(for sessionID: String) async {
retryDecryptionForCallsCount += 1
retryDecryptionForReceivedSessionID = sessionID
func retryDecryption(sessionIDs: [String]?) async {
retryDecryptionSessionIDsCallsCount += 1
retryDecryptionSessionIDsReceivedSessionIDs = sessionIDs
DispatchQueue.main.async {
self.retryDecryptionForReceivedInvocations.append(sessionID)
self.retryDecryptionSessionIDsReceivedInvocations.append(sessionIDs)
}
await retryDecryptionForClosure?(sessionID)
await retryDecryptionSessionIDsClosure?(sessionIDs)
}
//MARK: - paginateBackwards

8
ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
View File

@ -196,6 +196,14 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
.throttle(for: .milliseconds(100), scheduler: DispatchQueue.main, latest: true)
.weakAssign(to: \.state.unseenKnockRequests, on: self)
.store(in: &cancellables)
NotificationCenter.default.publisher(for: UIApplication.didBecomeActiveNotification)
.sink { [weak self] _ in
Task {
await self?.roomProxy.timeline.retryDecryption()
}
}
.store(in: &cancellables)
}
private func processIdentityStatusChanges(_ changes: [IdentityStatusChange]) async {

2
ElementX/Sources/Screens/Timeline/TimelineInteractionHandler.swift
View File

@ -157,8 +157,6 @@ class TimelineInteractionHandler {
let debugInfo = timelineController.debugInfo(for: eventTimelineItem.id)
MXLog.info("Showing debug info for \(eventTimelineItem.id)")
actionsSubject.send(.showDebugInfo(debugInfo))
case .retryDecryption(let sessionID):
Task { await timelineController.retryDecryption(for: sessionID) }
case .report:
actionsSubject.send(.displayReportContent(itemID: itemID, senderID: eventTimelineItem.sender.id))
case .react:

3
ElementX/Sources/Screens/Timeline/View/ItemMenu/TimelineItemMenuAction.swift
View File

@ -67,7 +67,6 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
case reply(isThread: Bool)
case forward(itemID: TimelineItemIdentifier)
case viewSource
case retryDecryption(sessionID: String)
case report
case react
case toggleReaction(key: String)
@ -164,8 +163,6 @@ enum TimelineItemMenuAction: Identifiable, Hashable {
Label(L10n.actionRemoveMessage, icon: \.delete)
case .viewSource:
Label(L10n.actionViewSource, icon: \.code)
case .retryDecryption:
Label(L10n.actionRetryDecryption, systemImage: "arrow.down.message")
case .report:
Label(L10n.actionReportContent, icon: \.chatProblem)
case .react:

9
ElementX/Sources/Screens/Timeline/View/ItemMenu/TimelineItemMenuActionProvider.swift
View File

@ -136,14 +136,7 @@ struct TimelineItemMenuActionProvider {
if isViewSourceEnabled {
actions.append(.viewSource)
}
switch encryptedItem.encryptionType {
case .megolmV1AesSha2(let sessionID, _):
secondaryActions.append(.retryDecryption(sessionID: sessionID))
default:
break
}
return .init(isReactable: false,
actions: actions,
secondaryActions: secondaryActions,

2
ElementX/Sources/Services/Timeline/TimelineController/MockRoomTimelineController.swift
View File

@ -139,8 +139,6 @@ class MockRoomTimelineController: RoomTimelineControllerProtocol {
nil
}
func retryDecryption(for sessionID: String) async { }
func eventTimestamp(for itemID: TimelineItemIdentifier) -> Date? {
timelineItemsTimestamp[itemID] ?? .now
}

4
ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
View File

@ -356,10 +356,6 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
return nil
}
func retryDecryption(for sessionID: String) async {
await activeTimeline.retryDecryption(for: sessionID)
}
// MARK: - Private
/// The cancellable used to update the timeline items.

2
ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineControllerProtocol.swift
View File

@ -82,7 +82,5 @@ protocol RoomTimelineControllerProtocol {
func sendHandle(for itemID: TimelineItemIdentifier) -> SendHandleProxy?
func retryDecryption(for sessionID: String) async
func eventTimestamp(for itemID: TimelineItemIdentifier) -> Date?
}

10
ElementX/Sources/Services/Timeline/TimelineProxy.swift
View File

@ -155,12 +155,14 @@ final class TimelineProxy: TimelineProxyProtocol {
}
}
func retryDecryption(for sessionID: String) async {
MXLog.info("Retrying decryption for sessionID: \(sessionID)")
func retryDecryption(sessionIDs: [String]?) async {
let sessionIDs = sessionIDs ?? []
MXLog.info("Retrying decryption for sessionIDs: \(sessionIDs)")
await Task.dispatch(on: .global()) { [weak self] in
self?.timeline.retryDecryption(sessionIds: [sessionID])
MXLog.info("Finished retrying decryption for sessionID: \(sessionID)")
self?.timeline.retryDecryption(sessionIds: sessionIDs)
MXLog.info("Finished retrying decryption for sessionID: \(sessionIDs)")
}
}

8
ElementX/Sources/Services/Timeline/TimelineProxyProtocol.swift
View File

@ -35,7 +35,7 @@ protocol TimelineProxyProtocol {
func messageEventContent(for timelineItemID: TimelineItemIdentifier) async -> RoomMessageEventContentWithoutRelation?
func retryDecryption(for sessionID: String) async
func retryDecryption(sessionIDs: [String]?) async
func paginateBackwards(requestSize: UInt16) async -> Result<Void, TimelineProxyError>
func paginateForwards(requestSize: UInt16) async -> Result<Void, TimelineProxyError>
@ -113,3 +113,9 @@ protocol TimelineProxyProtocol {
html: String?,
intentionalMentions: Mentions) -> RoomMessageEventContentWithoutRelation
}
extension TimelineProxyProtocol {
func retryDecryption() async {
await retryDecryption(sessionIDs: nil)
}
}