ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin 2025-05-13 13:42:39 +04:00
commit 9927abd73a
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
submodules/GalleryUI/Sources/GalleryController.swift
View File

@ -792,8 +792,8 @@ public class GalleryController: ViewController, StandalonePresentableController,
let syncResult = Atomic<(Bool, (() -> Void)?)>(value: (false, nil)) let syncResult = Atomic<(Bool, (() -> Void)?)>(value: (false, nil))
self.disposable.set(combineLatest( self.disposable.set(combineLatest(
messageView, messageView,
self.context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration]), self.context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration]) |> take(1),
translateToLanguage translateToLanguage |> take(1)
).start(next: { [weak self] view, preferencesView, translateToLanguage in ).start(next: { [weak self] view, preferencesView, translateToLanguage in
let f: () -> Void = { let f: () -> Void = {
if let strongSelf = self { if let strongSelf = self {

3
submodules/TelegramUI/Sources/AppDelegate.swift
View File

@ -2400,6 +2400,8 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
} }
private func reportFailedIncomingCallKitCall() { private func reportFailedIncomingCallKitCall() {
if #available(iOS 14.4, *) {
} else {
guard let callKitIntegration = CallKitIntegration.shared else { guard let callKitIntegration = CallKitIntegration.shared else {
return return
} }
@ -2425,6 +2427,7 @@ private func extractAccountManagerState(records: AccountRecordsView<TelegramAcco
callKitIntegration.dropCall(uuid: uuid) callKitIntegration.dropCall(uuid: uuid)
}) })
} }
}
private func authorizedContext() -> Signal<AuthorizedApplicationContext, NoError> { private func authorizedContext() -> Signal<AuthorizedApplicationContext, NoError> {
return self.context.get() return self.context.get()