github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various fixes

Browse source
This commit is contained in:
Ilya Laktyushin 2026-02-25 16:01:04 +04:00
parent dbb8dee236
commit 02f2607dd9
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
submodules/TelegramUI/Sources/AppDelegate.swift
View file

@ -2793,11 +2793,26 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
}
private var openUrlInProgress: URL?
private func openUrlWhenReady(url: URL, external: Bool = false) {
private func openUrlWhenReady(accountId: AccountRecordId? = nil, url: URL, external: Bool = false) {
self.openUrlInProgress = url
self.openUrlWhenReadyDisposable.set((self.authorizedContext()
let signal = self.sharedContextPromise.get()
|> take(1)
|> deliverOnMainQueue
|> mapToSignal { sharedApplicationContext -> Signal<AuthorizedApplicationContext, NoError> in
if let accountId = accountId {
sharedApplicationContext.sharedContext.switchToAccount(id: accountId)
return self.authorizedContext()
|> filter { context in
context.context.account.id == accountId
}
|> take(1)
} else {
return self.authorizedContext()
|> take(1)
}
}
self.openUrlWhenReadyDisposable.set((signal
|> deliverOnMainQueue).start(next: { [weak self] context in
context.openUrl(url, external: external)
@ -2813,7 +2828,7 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
if response.actionIdentifier == UNNotificationDefaultActionIdentifier {
if let dataUrl = response.notification.request.content.userInfo["url"] as? String {
if let url = URL(string: dataUrl) {
self.openUrlWhenReady(url: url, external: true)
self.openUrlWhenReady(accountId: accountId, url: url, external: true)
}
} else {
if let (peerId, threadId) = peerIdFromNotification(response.notification) {
@ -2999,7 +3014,7 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
let _ = (accountIdFromNotification(notification, sharedContext: self.sharedContextPromise.get())
|> deliverOnMainQueue).start(next: { accountId in
if let context = self.contextValue {
if let accountId = accountId, context.context.account.id != accountId {
if let accountId = accountId, context.context.account.id != accountId || notification.request.content.userInfo["url"] != nil {
completionHandler([.alert])
}
}