chore: remove session manager completion handlers - WPB-23401 #4301
+135
−150
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -471,7 +471,7 @@ | |
| object: nil, | ||
| queue: nil | ||
| ) { [weak self] _ in | ||
| WireLogger.sessionManager.debug("Received memory warning, tearing down background user sessions.") | ||
|
Check warning on line 474 in wire-ios-sync-engine/Source/SessionManager/SessionManager.swift
|
||
| self?.tearDownAllBackgroundSessions() | ||
| } | ||
|
|
||
|
|
@@ -688,70 +688,62 @@ | |
| } | ||
|
|
||
| /// Select the account to be the active account. | ||
| @MainActor | ||
| public func select(_ account: Account) async -> ZMUserSession? { | ||
| guard !isSelectingAccount else { | ||
| return nil | ||
| } | ||
|
|
||
| let isConfirmed = await confirmSwitchingAccount() | ||
|
|
||
| guard isConfirmed else { | ||
| return nil | ||
| } | ||
|
|
||
| isSelectingAccount = true | ||
| let selectedAccount = accountManager.selectedAccount | ||
|
|
||
| guard let delegate = delegate else { | ||
|
Check warning on line 706 in wire-ios-sync-engine/Source/SessionManager/SessionManager.swift
|
||
| return nil | ||
| } | ||
|
|
||
| return await withCheckedContinuation { continuation in | ||
|
Collaborator
There was a problem hiding this comment. suggestion: if you follow the path |
||
| delegate.sessionManagerWillOpenAccount( | ||
| account, | ||
| from: selectedAccount, | ||
| userSessionCanBeTornDown: { [weak self] in | ||
| self?.activeUserSession = nil | ||
|
|
||
| Task { @MainActor [weak self] in | ||
| guard let self else { | ||
| continuation.resume(returning: nil) | ||
| return | ||
| } | ||
|
|
||
| accountManager.select(account) | ||
| let session = await loadSession(for: account) | ||
| isSelectingAccount = false | ||
|
|
||
| continuation.resume(returning: session) | ||
| } | ||
| } | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @MainActor | ||
| public func addAccount(userInfo: [String: Any]? = nil) async { | ||
| let isConfirmed = await confirmSwitchingAccount() | ||
| guard isConfirmed else { return } | ||
|
|
||
| let error = NSError(userSessionErrorCode: .addAccountRequested, userInfo: userInfo) | ||
| await withCheckedContinuation { continuation in | ||
| delegate?.sessionManagerWillLogout( | ||
| environment: nil, | ||
| error: error | ||
| ) { [weak self] in | ||
| self?.activeUserSession = nil | ||
| continuation.resume() | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -778,9 +770,10 @@ | |
| WireLogger.sessionManager.debug("Deleting account \(account.userIdentifier)...") | ||
| if let secondAccount = accountManager.inactiveAccounts.first { | ||
| // Deleted an account but we can switch to another account | ||
| Task { | ||
|
Collaborator
There was a problem hiding this comment. question: why not make |
||
| _ = await select(secondAccount) | ||
| tearDownSessionAndDelete(account: account, eraseData: eraseData) | ||
| } | ||
| } else if accountManager.selectedAccount != account { | ||
| // Deleted an inactive account, there's no need notify the UI | ||
| tearDownSessionAndDelete(account: account, eraseData: eraseData) | ||
|
|
@@ -795,9 +788,10 @@ | |
| } | ||
|
|
||
| fileprivate func tearDownSessionAndDelete(account: Account, eraseData: Bool) { | ||
| Task { | ||
| await tearDownBackgroundSession(for: account.userIdentifier) | ||
| if eraseData { | ||
| deleteAccountData(for: account) | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -809,7 +803,9 @@ | |
| if session == activeUserSession { | ||
| logoutCurrentSession(deleteCookie: true, deleteAccount: false, error: error) | ||
| } else { | ||
| Task { | ||
| await tearDownBackgroundSession(for: account.userIdentifier) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -1089,27 +1085,24 @@ | |
| } | ||
|
|
||
| /// The active user session will be torn down and the app goes into migration state. | ||
| @MainActor | ||
| public func prepareForRestoreWithMigration() async { | ||
| guard let delegate else { | ||
| WireLogger.sessionManager.debug("SessionManager.delegate is nil, aborting migration preparation") | ||
| return | ||
| } | ||
|
|
||
| WireLogger.sessionManager.debug("SessionManager.delegate.sessionManagerWillMigrateAccount ...") | ||
| await delegate.sessionManagerWillMigrateAccount() | ||
|
|
||
| WireLogger.sessionManager.debug("... userSessionCanBeTornDown { ... }") | ||
|
|
||
| if let accountID = activeUserSession?.account.userIdentifier { | ||
| await tearDownBackgroundSession(for: accountID) | ||
| activeUserSession = nil | ||
| accountTokens.removeValue(forKey: accountID) | ||
| } else { | ||
| activeUserSession = nil | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -1274,23 +1267,24 @@ | |
| notifyNewUserSessionCreated(newSession) | ||
| } | ||
|
|
||
| @MainActor | ||
| func tearDownBackgroundSession(for accountId: UUID) async { | ||
| guard let userSession = backgroundUserSessions[accountId] else { | ||
| WireLogger.sessionManager | ||
| .error("No session to tear down for \(accountId), known sessions: \(backgroundUserSessions)") | ||
| return | ||
| } | ||
| tearDownObservers(account: accountId) | ||
| backgroundUserSessions[accountId] = nil | ||
|
|
||
| dispatchGroup.enter() | ||
| await withCheckedContinuation { continuation in | ||
| userSession.close(deleteCookie: false) { [weak self] in | ||
| self?.notifyUserSessionDestroyed(accountId) | ||
| continuation.resume() | ||
| self?.dispatchGroup.leave() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Tears down and releases all background user sessions. | ||
|
|
@@ -1299,8 +1293,10 @@ | |
| activeUserSession != session | ||
| } | ||
|
|
||
| Task { | ||
| for key in backgroundSessions.keys { | ||
| await tearDownBackgroundSession(for: key) | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -1823,22 +1819,28 @@ | |
|
|
||
| public extension SessionManager { | ||
|
|
||
| @MainActor | ||
| func confirmSwitchingAccount() async -> Bool { | ||
| guard | ||
| let switchingDelegate, | ||
| let activeUserSession, | ||
| activeUserSession.isCallOngoing | ||
| else { | ||
| // no confirmation to show if no call is ongoing | ||
| return true | ||
| } | ||
|
|
||
| let confirmed = await withCheckedContinuation { continuation in | ||
| switchingDelegate.confirmSwitchingAccount { confirmed in | ||
| continuation.resume(returning: confirmed) | ||
| } | ||
| } | ||
|
|
||
| if confirmed { | ||
| activeUserSession.callCenter?.endAllCalls() | ||
| } | ||
|
|
||
| return confirmed | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thought: not really part of the scope here but I'm curious to see what you think. Calling this method will ask a ui delegate to present an alert and request user confirmation. Do you think this kind of back and forth communication makes sense? Or would it be better to have a single direction: ui tries to select an account, if confirmation is needed, throw error, ui handles, gets confirmation, tries again passing in a confirmation flag. Something liKe: