github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-05 19:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix share extension unauthorized hang

Browse source 
Handle missing or unauthorized accounts as an authorization failure instead of returning a never-ending signal, allowing the share extension to present the existing login prompt and complete cleanly.\n\nFixes #2134.
This commit is contained in:
Positiveoo1 2026-07-04 09:15:48 +02:00
parent 6e370e06d1
commit 18489e7660
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
submodules/TelegramUI/Components/ShareExtensionContext/Sources/ShareExtensionContext.swift
View file

@ -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
@ -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 {
@ -484,7 +489,7 @@ 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))
@ -492,7 +497,6 @@ public class ShareRootControllerImpl {
}
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