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

Update submodules

Browse Source
This commit is contained in:
Peter 2019-01-06 22:44:15 +01:00
parent 21f445f628
commit c08b431cff
11 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NotificationContent/NotificationViewController.swift
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, voipMaxLayer: 0), 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, auxiliaryMethods: telegramAccountAuxiliaryMethods)
|> introduceError(NotificationContentAuthorizationError.self)
|> mapToSignal { account -> Signal<(Account, AccountManager), NotificationContentAuthorizationError> in
if let account = account {

2
Share/ShareRootController.swift
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, voipMaxLayer: 0), 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, auxiliaryMethods: telegramAccountAuxiliaryMethods)
|> introduceError(ShareAuthorizationError.self) |> mapToSignal { account -> Signal<(Account, AccountManager), ShareAuthorizationError> in
if let account = account {
switch account {

2
SiriIntents/IntentHandler.swift
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, voipMaxLayer: 0), 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, auxiliaryMethods: accountAuxiliaryMethods)
|> mapToSignal { account -> Signal<Account, NoError> in
if let account = account {
switch account {

8
Telegram-iOS/AppDelegate.swift
View File

@ -657,12 +657,6 @@ private enum QueuedWakeup: Int32 {
})
let watchManagerArgumentsPromise = Promise<WatchManagerArguments?>()
#if DEBUG
let testingEnvironment = true
#else
let testingEnvironment = false
#endif
self.context.set(self.accountManagerPromise.get()
|> deliverOnMainQueue
@ -672,7 +666,7 @@ private enum QueuedWakeup: Int32 {
!$0.isEmpty
}
|> distinctUntilChanged
return applicationContext(networkArguments: networkArguments, applicationBindings: applicationBindings, replyFromNotificationsActive: replyFromNotificationsActive, backgroundAudioActive: self.hasActiveAudioSession.get() |> distinctUntilChanged, watchManagerArguments: watchManagerArgumentsPromise.get(), accountManager: accountManager, rootPath: rootPath, legacyBasePath: appGroupUrl.path, testingEnvironment: testingEnvironment, mainWindow: self.mainWindow, reinitializedNotificationSettings: {
return applicationContext(networkArguments: networkArguments, applicationBindings: applicationBindings, replyFromNotificationsActive: replyFromNotificationsActive, backgroundAudioActive: self.hasActiveAudioSession.get() |> distinctUntilChanged, watchManagerArguments: watchManagerArgumentsPromise.get(), accountManager: accountManager, rootPath: rootPath, legacyBasePath: appGroupUrl.path, mainWindow: self.mainWindow, reinitializedNotificationSettings: {
let _ = (self.context.get()
|> take(1)
|> deliverOnMainQueue).start(next: { value in

4
Telegram-iOS/ApplicationContext.swift
View File

@ -7,8 +7,8 @@ import TelegramCore
import Display
import LegacyComponents
func applicationContext(networkArguments: NetworkInitializationArguments, applicationBindings: TelegramApplicationBindings, replyFromNotificationsActive: Signal<Bool, NoError>, backgroundAudioActive: Signal<Bool, NoError>, watchManagerArguments: Signal<WatchManagerArguments?, NoError>, accountManager: AccountManager, rootPath: String, legacyBasePath: String, testingEnvironment: Bool, mainWindow: Window1, reinitializedNotificationSettings: @escaping () -> Void) -> Signal<ApplicationContext?, NoError> {
return currentAccount(allocateIfNotExists: true, networkArguments: networkArguments, supplementary: false, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: testingEnvironment, auxiliaryMethods: telegramAccountAuxiliaryMethods)
func applicationContext(networkArguments: NetworkInitializationArguments, applicationBindings: TelegramApplicationBindings, replyFromNotificationsActive: Signal<Bool, NoError>, backgroundAudioActive: Signal<Bool, NoError>, watchManagerArguments: Signal<WatchManagerArguments?, NoError>, accountManager: AccountManager, rootPath: String, legacyBasePath: String, mainWindow: Window1, reinitializedNotificationSettings: @escaping () -> Void) -> Signal<ApplicationContext?, NoError> {
return currentAccount(allocateIfNotExists: true, networkArguments: networkArguments, supplementary: false, manager: accountManager, rootPath: rootPath, auxiliaryMethods: telegramAccountAuxiliaryMethods)
|> filter { $0 != nil }
|> deliverOnMainQueue
|> mapToSignal { account -> Signal<ApplicationContext?, NoError> in

2
Telegram-iOS/SnapshotEnvironment.swift
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", voipMaxLayer: 0), 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, auxiliaryMethods: AccountAuxiliaryMethods(updatePeerChatInputState: { _, _ in return nil }, fetchResource: { _, _, _, _ in
return .never()
}, fetchResourceMediaReferenceHash: { _ in
return .never()

6
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -1535,7 +1535,7 @@
"Channel.Info.Banned" = "Blacklist";
"Channel.Info.Members" = "Members";
"Channel.Members.AddMembers" = "Add Members";
"Channel.Members.AddMembers" = "Add Subscribers";
"Channel.Members.AddMembersHelp" = "Only channel admins can see this list.";
"Channel.Members.Title" = "Members";
"Channel.BlackList.Title" = "Blacklist";
@ -2529,6 +2529,10 @@ Unused sets are archived when you add more.";
"Channel.AdminLog.BanSendGifs" = "Send GIFs";
"Channel.AdminLog.MessageRestricted" = "%@ changed restrictions for %@ (%@)";
"Channel.AdminLog.MessageAdmin" = "%@ changed privileges for %@ (%@)";
"Channel.AdminLog.ChangeInfo" = "Change Info";
"Channel.AdminLog.PinMessages" = "Pin Messages";
"Channel.AdminLog.AddMembers" = "Add Members";
"Channel.AdminLog.SendPolls" = "Send Polls";
"Channel.AdminLog.CanChangeInfo" = "Change Info";
"Channel.AdminLog.CanSendMessages" = "Post Messages";

2
Widget/TodayViewController.swift
View File

@ -83,7 +83,7 @@ class TodayViewController: UIViewController, NCWidgetProviding {
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, voipMaxLayer: 0), supplementary: true, manager: accountManager, rootPath: rootPath, beginWithTestingEnvironment: false, auxiliaryMethods: auxiliaryMethods)
return currentAccount(allocateIfNotExists: false, networkArguments: NetworkInitializationArguments(apiId: apiId, languagesCategory: languagesCategory, appVersion: appVersion, voipMaxLayer: 0), supplementary: true, manager: accountManager, rootPath: rootPath, auxiliaryMethods: auxiliaryMethods)
|> mapToSignal { account -> Signal<Account, NoError> in
if let account = account {
switch account {

2
submodules/Postbox

@ -1 +1 @@
Subproject commit 7a701322aee430bc93b3c88e1deaec69ea762abf
Subproject commit 85567ebc83c8575679e70a1b29059d9ceb181a6b

2
submodules/TelegramCore

@ -1 +1 @@
Subproject commit 07bd3881e862a07db965c8dc34f9e3dbe4b67bf3
Subproject commit ea5c409072c21997e6a6367332a481ed024e9700

2
submodules/TelegramUI

@ -1 +1 @@
Subproject commit 56cd11069339a1bde3380d41b1afd89c51d61b58
Subproject commit 62730b9c0b9fab50b6e398ad0bf6847959dbce16