diff --git a/.gitmodules b/.gitmodules index 92f13c68b9..40bacdcd06 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,7 @@ url=../Display.git url=../LegacyComponents.git [submodule "submodules/libtgvoip"] path = submodules/libtgvoip -url=git@github.com:peter-iakovlev/libtgvoip.git +url=git@github.com:grishka/libtgvoip.git [submodule "submodules/lottie-ios"] path = submodules/lottie-ios url=git@github.com:peter-iakovlev/lottie-ios.git diff --git a/NotificationContent/Info.plist b/NotificationContent/Info.plist index 7a4a996c55..5598c61579 100644 --- a/NotificationContent/Info.plist +++ b/NotificationContent/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 655 + 667 NSExtension NSExtensionAttributes diff --git a/NotificationContent/NotificationViewController.swift b/NotificationContent/NotificationViewController.swift index 35aa79011e..60c9bdb835 100644 --- a/NotificationContent/NotificationViewController.swift +++ b/NotificationContent/NotificationViewController.swift @@ -77,7 +77,7 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi |> take(1) |> introduceError(NotificationContentAuthorizationError.self) |> mapToSignal { accountManager -> Signal<(Account, AccountManager), NotificationContentAuthorizationError> in - return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: telegramAccountAuxiliaryMethods) + return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion, voipMaxLayer: 0), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: telegramAccountAuxiliaryMethods) |> introduceError(NotificationContentAuthorizationError.self) |> mapToSignal { account -> Signal<(Account, AccountManager), NotificationContentAuthorizationError> in if let account = account { diff --git a/Share/Info.plist b/Share/Info.plist index 02f876346d..8b9c82c044 100644 --- a/Share/Info.plist +++ b/Share/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 655 + 667 NSExtension NSExtensionAttributes diff --git a/Share/ShareRootController.swift b/Share/ShareRootController.swift index 74dbd49540..cc6c389da8 100644 --- a/Share/ShareRootController.swift +++ b/Share/ShareRootController.swift @@ -157,7 +157,7 @@ class ShareRootController: UIViewController { Logger.shared.redactSensitiveData = loggingSettings.redactSensitiveData - return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: telegramAccountAuxiliaryMethods) + return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion, voipMaxLayer: 0), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: telegramAccountAuxiliaryMethods) |> introduceError(ShareAuthorizationError.self) |> mapToSignal { account -> Signal<(Account, AccountManager), ShareAuthorizationError> in if let account = account { switch account { diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist index 47357721f5..25dc5d3410 100644 --- a/SiriIntents/Info.plist +++ b/SiriIntents/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 655 + 667 NSExtension NSExtensionAttributes diff --git a/SiriIntents/IntentHandler.swift b/SiriIntents/IntentHandler.swift index f3811f9943..da9bf048cf 100644 --- a/SiriIntents/IntentHandler.swift +++ b/SiriIntents/IntentHandler.swift @@ -83,7 +83,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag account = accountManager(basePath: rootPath + "/accounts-metadata") |> take(1) |> mapToSignal { accountManager -> Signal in - return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: accountAuxiliaryMethods) + return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion, voipMaxLayer: 0), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: accountAuxiliaryMethods) |> mapToSignal { account -> Signal in if let account = account { switch account { diff --git a/Telegram-iOS UITests/Info.plist b/Telegram-iOS UITests/Info.plist index 607312c943..469d7cc131 100644 --- a/Telegram-iOS UITests/Info.plist +++ b/Telegram-iOS UITests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 655 + 667 diff --git a/Telegram-iOS.xcodeproj/project.pbxproj b/Telegram-iOS.xcodeproj/project.pbxproj index 3a117de5e5..69522f3a7a 100644 --- a/Telegram-iOS.xcodeproj/project.pbxproj +++ b/Telegram-iOS.xcodeproj/project.pbxproj @@ -4694,7 +4694,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4735,7 +4735,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP (6N38VWS5BX)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP (6N38VWS5BX)"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = 6N38VWS5BX; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4871,7 +4871,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Fork.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -4936,7 +4936,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "Share/Share-Fork.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; @@ -4965,7 +4965,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Fork.entitlements"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -5855,7 +5855,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; @@ -5887,7 +5887,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -5917,7 +5917,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -5996,7 +5996,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = 6N38VWS5BX; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6062,7 +6062,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = Share/Info.plist; @@ -6092,7 +6092,7 @@ CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer: Peter Iakovlev (88P695A564)"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -6163,7 +6163,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6226,7 +6226,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-HockeyApp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = Share/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -6255,7 +6255,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -6333,7 +6333,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = C67CF9S4VU; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -6399,7 +6399,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = Share/Info.plist; @@ -6430,7 +6430,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -6977,7 +6977,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = C67CF9S4VU; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -7041,7 +7041,7 @@ CODE_SIGN_ENTITLEMENTS = "Share/Share-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = C67CF9S4VU; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Share/Info.plist; @@ -7071,7 +7071,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStoreLLC.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = C67CF9S4VU; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7223,7 +7223,7 @@ CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_SUSPICIOUS_MOVES = YES; CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; @@ -7252,7 +7252,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-AppStore.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = 6N38VWS5BX; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7280,7 +7280,7 @@ CODE_SIGN_ENTITLEMENTS = "SiriIntents/SiriIntents-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; INFOPLIST_FILE = SiriIntents/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -7350,7 +7350,7 @@ CODE_SIGN_ENTITLEMENTS = "Telegram-iOS/Telegram-iOS-Hockeyapp.entitlements"; CODE_SIGN_IDENTITY = "iPhone Distribution: TELEGRAM MESSENGER LLP"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: TELEGRAM MESSENGER LLP"; - CURRENT_PROJECT_VERSION = 655; + CURRENT_PROJECT_VERSION = 667; DEVELOPMENT_TEAM = X834Q8SBVP; ENABLE_BITCODE = YES; FRAMEWORK_SEARCH_PATHS = ( diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift index c20d647830..9636673938 100644 --- a/Telegram-iOS/AppDelegate.swift +++ b/Telegram-iOS/AppDelegate.swift @@ -356,7 +356,7 @@ private enum QueuedWakeup: Int32 { let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "unknown" - let networkArguments = NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion) + let networkArguments = NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion, voipMaxLayer: PresentationCallManager.voipMaxLayer) let appGroupName = "group.\(Bundle.main.bundleIdentifier!)" let maybeAppGroupUrl = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupName) @@ -1224,7 +1224,7 @@ private enum QueuedWakeup: Int32 { if let callbackUrl = URL(string: secureIdCallbackUrl(with: secureIdData.callbackUrl, peerId: secureIdData.peerId, result: .cancel, parameters: [:])) { UIApplication.shared.openURL(callbackUrl) } - }), TextAlertAction(type: .defaultAction, title: strings.Common_OK, action: {})]), on: .root, blockInteraction: false) + }), TextAlertAction(type: .defaultAction, title: strings.Common_OK, action: {})]), on: .root, blockInteraction: false, completion: {}) } else if let confirmationCode = parseConfirmationCodeUrl(url) { context.rootController.applyConfirmationCode(confirmationCode) } diff --git a/Telegram-iOS/Info.plist b/Telegram-iOS/Info.plist index f2a3dd8d92..6afc128f28 100644 --- a/Telegram-iOS/Info.plist +++ b/Telegram-iOS/Info.plist @@ -56,7 +56,7 @@ CFBundleVersion - 655 + 667 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/Telegram-iOS/SnapshotEnvironment.swift b/Telegram-iOS/SnapshotEnvironment.swift index eee90ce11e..ddbaf6dd7a 100644 --- a/Telegram-iOS/SnapshotEnvironment.swift +++ b/Telegram-iOS/SnapshotEnvironment.swift @@ -32,7 +32,7 @@ func snapshotEnvironment(application: UIApplication, mainWindow: UIWindow, statu var result: Account? while true { - let account = currentAccount(allocateIfNotExists: true, networkArguments: NetworkInitializationArguments(apiId: 0, languagesCategory: "ios", appVersion: "unknown"), supplementary: false, manager: accountManagerValue!, rootPath: path, beginWithTestingEnvironment: true, auxiliaryMethods: AccountAuxiliaryMethods(updatePeerChatInputState: { _, _ in return nil }, fetchResource: { _, _, _, _ in + let account = currentAccount(allocateIfNotExists: true, networkArguments: NetworkInitializationArguments(apiId: 0, languagesCategory: "ios", appVersion: "unknown", voipMaxLayer: 0), supplementary: false, manager: accountManagerValue!, rootPath: path, beginWithTestingEnvironment: true, auxiliaryMethods: AccountAuxiliaryMethods(updatePeerChatInputState: { _, _ in return nil }, fetchResource: { _, _, _, _ in return .never() }, fetchResourceMediaReferenceHash: { _ in return .never() diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 9bd138b8a2..31d4d9de48 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -516,7 +516,6 @@ "DialogList.You" = "You"; // Settings -"Settings.TabTitle" = "Settings"; "Settings.SetProfilePhoto" = "Set Profile Photo"; "Settings.Logout" = "Log Out"; "Settings.Title" = "Settings"; diff --git a/Telegram-iOSTests/Info.plist b/Telegram-iOSTests/Info.plist index 6ab28a514e..4e002d9359 100644 --- a/Telegram-iOSTests/Info.plist +++ b/Telegram-iOSTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 655 + 667 diff --git a/Watch/App/Info.plist b/Watch/App/Info.plist index 7a249b9e00..f28b3a0c81 100644 --- a/Watch/App/Info.plist +++ b/Watch/App/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 655 + 667 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/Watch/Extension/Info.plist b/Watch/Extension/Info.plist index e8ae6a2c18..de5a18c80c 100644 --- a/Watch/Extension/Info.plist +++ b/Watch/Extension/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 655 + 667 NSExtension NSExtensionAttributes diff --git a/Widget/Info.plist b/Widget/Info.plist index 73c967f36f..40df549990 100644 --- a/Widget/Info.plist +++ b/Widget/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 5.1.0 CFBundleVersion - 655 + 667 NSExtension NSExtensionMainStoryboard diff --git a/Widget/TodayViewController.swift b/Widget/TodayViewController.swift index 4f05d81189..142a645d41 100644 --- a/Widget/TodayViewController.swift +++ b/Widget/TodayViewController.swift @@ -81,26 +81,26 @@ class TodayViewController: UIViewController, NCWidgetProviding { let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "unknown" initializeAccountManagement() account = accountManager(basePath: rootPath + "/accounts-metadata") - |> take(1) - |> mapToSignal { accountManager -> Signal in - return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: auxiliaryMethods) - |> mapToSignal { account -> Signal in - if let account = account { - switch account { - case .upgrading: - return .complete() - case let .authorized(account): - accountCache = account - return .single(account) - case .unauthorized: - return .complete() - } - } else { - return .complete() - } + |> take(1) + |> mapToSignal { accountManager -> Signal in + return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion, voipMaxLayer: 0), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: auxiliaryMethods) + |> mapToSignal { account -> Signal in + if let account = account { + switch account { + case .upgrading: + return .complete() + case let .authorized(account): + accountCache = account + return .single(account) + case .unauthorized: + return .complete() + } + } else { + return .complete() } } - |> take(1) + } + |> take(1) } let applicationInterface = account |> afterNext { account in diff --git a/submodules/libtgvoip b/submodules/libtgvoip index dfe1f030c9..78e584c443 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit dfe1f030c94033966644370204d8943addee27f1 +Subproject commit 78e584c443b93ce2794bee75c7448d1b00f1edc9