Skip to content

Fix share extension hang when no account is logged in #2223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Positiveoo1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix share extension hang when no account is logged in #2223

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions submodules/TelegramUI/Components/ShareExtensionContext/Sources/ShareExtensionContext.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,10 @@ public class ShareRootControllerImpl {
isICloudEnabled: false
)

let accountData: Signal<(ShareControllerEnvironment, ShareControllerAccountContext, [ShareControllerSwitchableAccount]), NoError> = accountManager.accountRecords()
let accountData: Signal<(ShareControllerEnvironment, ShareControllerAccountContext, [ShareControllerSwitchableAccount]), ShareAuthorizationError> = accountManager.accountRecords()
|> take(1)
|> mapToSignal { view -> Signal<(ShareControllerEnvironment, ShareControllerAccountContext, [ShareControllerSwitchableAccount]), NoError> in
|> castError(ShareAuthorizationError.self)
|> mapToSignal { view -> Signal<(ShareControllerEnvironment, ShareControllerAccountContext, [ShareControllerSwitchableAccount]), ShareAuthorizationError> in
var signals: [Signal<(AccountRecordId, AccountStateManager, EnginePeer)?, NoError>] = []
for record in view.records {
if record.attributes.contains(where: { attribute in
Expand Down Expand Up @@ -464,8 +465,12 @@ public class ShareRootControllerImpl {
}
})
}
if signals.isEmpty {
return .fail(.unauthorized)
}
return combineLatest(signals)
|> mapToSignal { stateManagers -> Signal<(ShareControllerEnvironment, ShareControllerAccountContext, [ShareControllerSwitchableAccount]), NoError> in
|> castError(ShareAuthorizationError.self)
|> mapToSignal { stateManagers -> Signal<(ShareControllerEnvironment, ShareControllerAccountContext, [ShareControllerSwitchableAccount]), ShareAuthorizationError> in
var allAccounts: [ShareControllerSwitchableAccount] = []
for data in stateManagers {
guard let (id, stateManager, peer) = data else {
Expand All @@ -484,15 +489,14 @@ public class ShareRootControllerImpl {
}

guard let currentAccount = allAccounts.first(where: { $0.account.accountId == view.currentRecord?.id }) else {
return .never()
return .fail(.unauthorized)
}

return .single((environment, currentAccount.account, allAccounts))
}
}

let applicationInterface: Signal<(ShareControllerEnvironment, ShareControllerAccountContext, PostboxAccessChallengeData, [ShareControllerSwitchableAccount]), ShareAuthorizationError> = accountData
|> castError(ShareAuthorizationError.self)
|> mapToSignal { data -> Signal<(ShareControllerEnvironment, ShareControllerAccountContext, PostboxAccessChallengeData, [ShareControllerSwitchableAccount]), ShareAuthorizationError> in
let (environment, context, otherAccounts) = data

Expand Down