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

This commit is contained in:
Ilya Laktyushin
2018-11-23 22:13:58 +04:00
19 changed files with 59 additions and 60 deletions

2
.gitmodules vendored
View File

@@ -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

View File

@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

View File

@@ -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 {

View File

@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

View File

@@ -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 {

View File

@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

View File

@@ -83,7 +83,7 @@ class IntentHandler: INExtension, INSendMessageIntentHandling, INSearchForMessag
account = accountManager(basePath: rootPath + "/accounts-metadata")
|> take(1)
|> mapToSignal { accountManager -> Signal<Account, NoError> 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<Account, NoError> in
if let account = account {
switch account {

View File

@@ -17,6 +17,6 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
</dict>
</plist>

View File

@@ -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 = (

View File

@@ -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)
}

View File

@@ -56,7 +56,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>

View File

@@ -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()

View File

@@ -516,7 +516,6 @@
"DialogList.You" = "You";
// Settings
"Settings.TabTitle" = "Settings";
"Settings.SetProfilePhoto" = "Set Profile Photo";
"Settings.Logout" = "Log Out";
"Settings.Title" = "Settings";

View File

@@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
</dict>
</plist>

View File

@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>

View File

@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>

View File

@@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>5.1.0</string>
<key>CFBundleVersion</key>
<string>655</string>
<string>667</string>
<key>NSExtension</key>
<dict>
<key>NSExtensionMainStoryboard</key>

View File

@@ -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<Account, NoError> 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<Account, NoError> 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<Account, NoError> 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<Account, NoError> 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