From d8765b1b3dd0737e599cd6d06541b201a1832000 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 26 Mar 2019 15:48:14 +0400 Subject: [PATCH 1/5] Bump version --- NotificationContent/Info.plist | 2 +- NotificationService/Info.plist | 2 +- Share/Info.plist | 2 +- SiriIntents/Info.plist | 2 +- Telegram-iOS/Info.plist | 2 +- Watch/App/Info.plist | 2 +- Watch/Extension/Info.plist | 2 +- Widget/Info.plist | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NotificationContent/Info.plist b/NotificationContent/Info.plist index fe3d0478fb..80cbbcd91c 100644 --- a/NotificationContent/Info.plist +++ b/NotificationContent/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.5 + 5.5.1 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/NotificationService/Info.plist b/NotificationService/Info.plist index 5ff53bd917..18eceb0557 100644 --- a/NotificationService/Info.plist +++ b/NotificationService/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.5 + 5.5.1 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/Share/Info.plist b/Share/Info.plist index c5a9adb70a..2b77913fa3 100644 --- a/Share/Info.plist +++ b/Share/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.5 + 5.5.1 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/SiriIntents/Info.plist b/SiriIntents/Info.plist index 330c3508d8..9890849e7e 100644 --- a/SiriIntents/Info.plist +++ b/SiriIntents/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.5 + 5.5.1 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/Telegram-iOS/Info.plist b/Telegram-iOS/Info.plist index 64bcb6a6e0..4d9d9b0fb5 100644 --- a/Telegram-iOS/Info.plist +++ b/Telegram-iOS/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.5 + 5.5.1 CFBundleSignature ???? CFBundleURLTypes diff --git a/Watch/App/Info.plist b/Watch/App/Info.plist index f6b63768b0..b40b6bd78f 100644 --- a/Watch/App/Info.plist +++ b/Watch/App/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 5.5 + 5.5.1 CFBundleVersion ${BUILD_NUMBER} UISupportedInterfaceOrientations diff --git a/Watch/Extension/Info.plist b/Watch/Extension/Info.plist index cff3e8511b..251de38f75 100644 --- a/Watch/Extension/Info.plist +++ b/Watch/Extension/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.5 + 5.5.1 CFBundleVersion ${BUILD_NUMBER} NSExtension diff --git a/Widget/Info.plist b/Widget/Info.plist index 2eff403b88..e2c70d7d60 100644 --- a/Widget/Info.plist +++ b/Widget/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType XPC! CFBundleShortVersionString - 5.5 + 5.5.1 CFBundleVersion ${BUILD_NUMBER} NSExtension From 026049cc82c36607321d4b1767732dcd2f2ec78c Mon Sep 17 00:00:00 2001 From: Peter Iakovlev Date: Tue, 26 Mar 2019 17:15:48 +0400 Subject: [PATCH 2/5] Update localization --- Telegram-iOS/en.lproj/Localizable.strings | 5 ++++- submodules/Postbox | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- submodules/ffmpeg | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 1e29b638f1..23fa8b41d0 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -3926,8 +3926,8 @@ Unused sets are archived when you add more."; "ChatList.DeleteSavedMessagesConfirmation" = "Are you sure you want to delete\nSaved Messages?"; "Undo.Undo" = "Undo"; -"Undo.MessagesDeleted" = "Messages deleted"; "Undo.ChatDeleted" = "Chat deleted"; +"Undo.ChatCleared" = "Chat cleared"; "Undo.SecretChatDeleted" = "Secret Chat deleted"; "Undo.LeftChannel" = "Left channel"; "Undo.LeftGroup" = "Left group"; @@ -4200,3 +4200,6 @@ Unused sets are archived when you add more."; "Settings.CheckPhoneNumberText" = "Keep your number up to date to ensure you can always log in to Telegram. [Learn more]()"; "Settings.KeepPhoneNumber" = "Keep %@"; "Settings.ChangePhoneNumber" = "Change Number"; + +"Undo.ChatDeletedForBothSides" = "Chat deleted for both sides"; +"Undo.MessagesDeletedForBothSides" = "Chat cleared for both sides"; diff --git a/submodules/Postbox b/submodules/Postbox index 4cb811a442..eca5668fc9 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit 4cb811a4422113791dd784327201fae925e4329c +Subproject commit eca5668fc9834be348e65edde3f4ec07eeffef0c diff --git a/submodules/TelegramCore b/submodules/TelegramCore index fbc5d0007a..fdcc098f80 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit fbc5d0007a5aa1eed96abdcd63132cfcbe1d1cd7 +Subproject commit fdcc098f8050834dd936f53a4476ac529abe6a58 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 9bc9084877..cf65440d8d 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 9bc90848770ae5301d0c260c75692ab1dae262c9 +Subproject commit cf65440d8d76b223c80fe273a19aef619c5a2828 diff --git a/submodules/ffmpeg b/submodules/ffmpeg index 4ea8057cf2..0495e4606b 160000 --- a/submodules/ffmpeg +++ b/submodules/ffmpeg @@ -1 +1 @@ -Subproject commit 4ea8057cf28b1872bdcf5539481195c75af8e1ed +Subproject commit 0495e4606b6a109f951f963c95b3d57ed5e031ff From a3d7fe300683463b137efc9d61dc93c7c25f0f85 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 26 Mar 2019 17:18:13 +0400 Subject: [PATCH 3/5] Make app startup asynchronous --- Telegram-iOS/AppDelegate.swift | 237 ++++++++++++++------------ Telegram-iOS/ApplicationContext.swift | 5 +- submodules/Postbox | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 5 files changed, 131 insertions(+), 117 deletions(-) diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift index 125df21817..2f30bb5667 100644 --- a/Telegram-iOS/AppDelegate.swift +++ b/Telegram-iOS/AppDelegate.swift @@ -120,7 +120,7 @@ private enum QueuedWakeup: Int32 { case backgroundLocation } -private final class SharedApplicationContext { +final class SharedApplicationContext { let sharedContext: SharedAccountContext let notificationManager: SharedNotificationManager let wakeupManager: SharedWakeupManager @@ -571,125 +571,131 @@ private final class SharedApplicationContext { self.window?.rootViewController?.dismiss(animated: true, completion: nil) }) - // Move back to signal - let accountManager = AccountManager(basePath: rootPath + "/accounts-metadata") - let upgradeSemaphore = DispatchSemaphore(value: 0) - let _ = upgradedAccounts(accountManager: accountManager, rootPath: rootPath).start(completed: { - upgradeSemaphore.signal() - }) - upgradeSemaphore.wait() - - var initialPresentationDataAndSettings: InitialPresentationDataAndSettings? - let semaphore = DispatchSemaphore(value: 0) - let _ = currentPresentationDataAndSettings(accountManager: accountManager).start(next: { value in - initialPresentationDataAndSettings = value - semaphore.signal() - }) - semaphore.wait() - - let legacyBasePath = appGroupUrl.path - let legacyCache = LegacyCache(path: legacyBasePath + "/Caches") - - var setPresentationCall: ((PresentationCall?) -> Void)? - let sharedContext = SharedAccountContext(mainWindow: self.mainWindow, basePath: rootPath, accountManager: accountManager, applicationBindings: applicationBindings, initialPresentationDataAndSettings: initialPresentationDataAndSettings!, networkArguments: networkArguments, rootPath: rootPath, legacyBasePath: legacyBasePath, legacyCache: legacyCache, apsNotificationToken: self.notificationTokenPromise.get() |> map(Optional.init), voipNotificationToken: self.voipTokenPromise.get() |> map(Optional.init), setNotificationCall: { call in - setPresentationCall?(call) - }, navigateToChat: { accountId, peerId, messageId in - self.openChatWhenReady(accountId: accountId, peerId: peerId, messageId: messageId) - }) - - let rawAccounts = sharedContext.activeAccounts - |> map { _, accounts, _ -> [Account] in - return accounts.map({ $0.1 }) + let accountManagerSignal = Signal { subscriber in + let accountManager = AccountManager(basePath: rootPath + "/accounts-metadata") + return upgradedAccounts(accountManager: accountManager, rootPath: rootPath).start(completed: { + subscriber.putNext(accountManager) + subscriber.putCompletion() + }) + return EmptyDisposable } - let _ = (sharedAccountInfos(accountManager: sharedContext.accountManager, accounts: rawAccounts) - |> deliverOn(Queue())).start(next: { infos in - storeAccountsData(rootPath: rootPath, accounts: infos) - }) - sharedContext.presentGlobalController = { [weak self] c, a in - guard let strongSelf = self else { - return + let sharedContextSignal = accountManagerSignal + |> deliverOnMainQueue + |> mapToSignal { accountManager -> Signal<(SharedApplicationContext, LoggingSettings), NoError> in + var initialPresentationDataAndSettings: InitialPresentationDataAndSettings? + let semaphore = DispatchSemaphore(value: 0) + let _ = currentPresentationDataAndSettings(accountManager: accountManager).start(next: { value in + initialPresentationDataAndSettings = value + semaphore.signal() + }) + semaphore.wait() + + let legacyBasePath = appGroupUrl.path + let legacyCache = LegacyCache(path: legacyBasePath + "/Caches") + + var setPresentationCall: ((PresentationCall?) -> Void)? + let sharedContext = SharedAccountContext(mainWindow: self.mainWindow, basePath: rootPath, accountManager: accountManager, applicationBindings: applicationBindings, initialPresentationDataAndSettings: initialPresentationDataAndSettings!, networkArguments: networkArguments, rootPath: rootPath, legacyBasePath: legacyBasePath, legacyCache: legacyCache, apsNotificationToken: self.notificationTokenPromise.get() |> map(Optional.init), voipNotificationToken: self.voipTokenPromise.get() |> map(Optional.init), setNotificationCall: { call in + setPresentationCall?(call) + }, navigateToChat: { accountId, peerId, messageId in + self.openChatWhenReady(accountId: accountId, peerId: peerId, messageId: messageId) + }) + + let rawAccounts = sharedContext.activeAccounts + |> map { _, accounts, _ -> [Account] in + return accounts.map({ $0.1 }) } - strongSelf.mainWindow.present(c, on: .root) - } - sharedContext.presentCrossfadeController = { [weak self] in - guard let strongSelf = self else { - return - } - var exists = false - strongSelf.mainWindow.forEachViewController { controller in - if controller is ThemeSettingsCrossfadeController { - exists = true + let _ = (sharedAccountInfos(accountManager: sharedContext.accountManager, accounts: rawAccounts) + |> deliverOn(Queue())).start(next: { infos in + storeAccountsData(rootPath: rootPath, accounts: infos) + }) + + sharedContext.presentGlobalController = { [weak self] c, a in + guard let strongSelf = self else { + return + } + strongSelf.mainWindow.present(c, on: .root) + } + sharedContext.presentCrossfadeController = { [weak self] in + guard let strongSelf = self else { + return + } + var exists = false + strongSelf.mainWindow.forEachViewController { controller in + if controller is ThemeSettingsCrossfadeController { + exists = true + } + return true + } + + if !exists { + strongSelf.mainWindow.present(ThemeSettingsCrossfadeController(), on: .root) } - return true } - if !exists { - strongSelf.mainWindow.present(ThemeSettingsCrossfadeController(), on: .root) - } - } - - let notificationManager = SharedNotificationManager(episodeId: self.episodeId, application: application, clearNotificationsManager: clearNotificationsManager, inForeground: applicationBindings.applicationInForeground, accounts: sharedContext.activeAccounts |> map { primary, accounts, _ in accounts.map({ ($0.1, $0.1.id == primary?.id) }) }, pollLiveLocationOnce: { accountId in - let _ = (self.context.get() - |> filter { - return $0 != nil - } - |> take(1) - |> deliverOnMainQueue).start(next: { context in - if let context = context, context.context.account.id == accountId { - context.context.liveLocationManager?.pollOnce() + let notificationManager = SharedNotificationManager(episodeId: self.episodeId, application: application, clearNotificationsManager: clearNotificationsManager, inForeground: applicationBindings.applicationInForeground, accounts: sharedContext.activeAccounts |> map { primary, accounts, _ in accounts.map({ ($0.1, $0.1.id == primary?.id) }) }, pollLiveLocationOnce: { accountId in + let _ = (self.context.get() + |> filter { + return $0 != nil } + |> take(1) + |> deliverOnMainQueue).start(next: { context in + if let context = context, context.context.account.id == accountId { + context.context.liveLocationManager?.pollOnce() + } + }) }) - }) - setPresentationCall = { call in - notificationManager.setNotificationCall(call, strings: sharedContext.currentPresentationData.with({ $0 }).strings) - } - let liveLocationPolling = self.context.get() - |> mapToSignal { context -> Signal in - if let context = context, let liveLocationManager = context.context.liveLocationManager { - let accountId = context.context.account.id - return liveLocationManager.isPolling - |> distinctUntilChanged - |> map { value -> AccountRecordId? in - if value { - return accountId - } else { - return nil + setPresentationCall = { call in + notificationManager.setNotificationCall(call, strings: sharedContext.currentPresentationData.with({ $0 }).strings) + } + let liveLocationPolling = self.context.get() + |> mapToSignal { context -> Signal in + if let context = context, let liveLocationManager = context.context.liveLocationManager { + let accountId = context.context.account.id + return liveLocationManager.isPolling + |> distinctUntilChanged + |> map { value -> AccountRecordId? in + if value { + return accountId + } else { + return nil + } } + } else { + return .single(nil) } - } else { - return .single(nil) + } + let watchTasks = self.context.get() + |> mapToSignal { context -> Signal in + if let context = context, let watchManager = context.context.watchManager { + let accountId = context.context.account.id + let runningTasks: Signal = .single(nil) + |> then(watchManager.runningTasks) + return runningTasks + |> distinctUntilChanged + |> map { value -> AccountRecordId? in + if let value = value, value.running { + return accountId + } else { + return nil + } + } + |> distinctUntilChanged + } else { + return .single(nil) + } + } + let wakeupManager = SharedWakeupManager(beginBackgroundTask: { name, expiration in application.beginBackgroundTask(withName: name, expirationHandler: expiration) }, endBackgroundTask: { id in application.endBackgroundTask(id) }, backgroundTimeRemaining: { application.backgroundTimeRemaining }, activeAccounts: sharedContext.activeAccounts |> map { ($0.0, $0.1.map { ($0.0, $0.1) }) }, liveLocationPolling: liveLocationPolling, watchTasks: watchTasks, inForeground: applicationBindings.applicationInForeground, hasActiveAudioSession: self.hasActiveAudioSession.get(), notificationManager: notificationManager, mediaManager: sharedContext.mediaManager, callManager: sharedContext.callManager, accountUserInterfaceInUse: { id in + return sharedContext.accountUserInterfaceInUse(id) + }) + let sharedApplicationContext = SharedApplicationContext(sharedContext: sharedContext, notificationManager: notificationManager, wakeupManager: wakeupManager) + sharedApplicationContext.sharedContext.mediaManager.overlayMediaManager.attachOverlayMediaController(sharedApplicationContext.overlayMediaController) + + return accountManager.transaction { transaction -> (SharedApplicationContext, LoggingSettings) in + return (sharedApplicationContext, transaction.getSharedData(SharedDataKeys.loggingSettings) as? LoggingSettings ?? LoggingSettings.defaultSettings) } } - let watchTasks = self.context.get() - |> mapToSignal { context -> Signal in - if let context = context, let watchManager = context.context.watchManager { - let accountId = context.context.account.id - let runningTasks: Signal = .single(nil) - |> then(watchManager.runningTasks) - return runningTasks - |> distinctUntilChanged - |> map { value -> AccountRecordId? in - if let value = value, value.running { - return accountId - } else { - return nil - } - } - |> distinctUntilChanged - } else { - return .single(nil) - } - } - let wakeupManager = SharedWakeupManager(beginBackgroundTask: { name, expiration in application.beginBackgroundTask(withName: name, expirationHandler: expiration) }, endBackgroundTask: { id in application.endBackgroundTask(id) }, backgroundTimeRemaining: { application.backgroundTimeRemaining }, activeAccounts: sharedContext.activeAccounts |> map { ($0.0, $0.1.map { ($0.0, $0.1) }) }, liveLocationPolling: liveLocationPolling, watchTasks: watchTasks, inForeground: applicationBindings.applicationInForeground, hasActiveAudioSession: hasActiveAudioSession.get(), notificationManager: notificationManager, mediaManager: sharedContext.mediaManager, callManager: sharedContext.callManager, accountUserInterfaceInUse: { id in - return sharedContext.accountUserInterfaceInUse(id) - }) - let sharedApplicationContext = SharedApplicationContext(sharedContext: sharedContext, notificationManager: notificationManager, wakeupManager: wakeupManager) - sharedApplicationContext.sharedContext.mediaManager.overlayMediaManager.attachOverlayMediaController(sharedApplicationContext.overlayMediaController) - self.sharedContextPromise.set( - accountManager.transaction { transaction -> (SharedApplicationContext, LoggingSettings) in - return (sharedApplicationContext, transaction.getSharedData(SharedDataKeys.loggingSettings) as? LoggingSettings ?? LoggingSettings.defaultSettings) - } + self.sharedContextPromise.set(sharedContextSignal |> mapToSignal { sharedApplicationContext, loggingSettings -> Signal in Logger.shared.logToFile = loggingSettings.logToFile Logger.shared.logToConsole = loggingSettings.logToConsole @@ -793,7 +799,7 @@ private final class SharedApplicationContext { |> map { accountAndSettings -> AuthorizedApplicationContext? in return accountAndSettings.flatMap { account, limitsConfiguration, callListSettings in let context = AccountContext(sharedContext: sharedApplicationContext.sharedContext, account: account, limitsConfiguration: limitsConfiguration) - return AuthorizedApplicationContext(mainWindow: self.mainWindow, watchManagerArguments: watchManagerArgumentsPromise.get(), context: context, accountManager: sharedApplicationContext.sharedContext.accountManager, showCallsTab: callListSettings.showTab, reinitializedNotificationSettings: { + return AuthorizedApplicationContext(sharedApplicationContext: sharedApplicationContext, mainWindow: self.mainWindow, watchManagerArguments: watchManagerArgumentsPromise.get(), context: context, accountManager: sharedApplicationContext.sharedContext.accountManager, showCallsTab: callListSettings.showTab, reinitializedNotificationSettings: { let _ = (self.context.get() |> take(1) |> deliverOnMainQueue).start(next: { context in @@ -932,7 +938,7 @@ private final class SharedApplicationContext { } return true }) - self.mainWindow.topLevelOverlayControllers = [sharedApplicationContext.overlayMediaController, context.notificationController] + self.mainWindow.topLevelOverlayControllers = [context.sharedApplicationContext.overlayMediaController, context.notificationController] var authorizeNotifications = true if #available(iOS 10.0, *) { authorizeNotifications = false @@ -979,7 +985,10 @@ private final class SharedApplicationContext { })) self.watchCommunicationManagerPromise.set(watchCommunicationManager(context: self.context, allowBackgroundTimeExtension: { timeout in - wakeupManager.allowBackgroundTimeExtension(timeout: timeout) + let _ = (self.sharedContextPromise.get() + |> take(1)).start(next: { sharedContext in + sharedContext.wakeupManager.allowBackgroundTimeExtension(timeout: timeout) + }) })) let _ = self.watchCommunicationManagerPromise.get().start(next: { manager in if let manager = manager { @@ -1059,8 +1068,10 @@ private final class SharedApplicationContext { } })) } - let presentationData = sharedContext.currentPresentationData.with { $0 } - strongSelf.mainWindow.present(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: presentationData.theme), title: alert.title, text: alert.message ?? "", actions: actions), on: .root) + if let sharedContext = strongSelf.contextValue?.context.sharedContext { + let presentationData = sharedContext.currentPresentationData.with { $0 } + strongSelf.mainWindow.present(standardTextAlertController(theme: AlertControllerTheme(presentationTheme: presentationData.theme), title: alert.title, text: alert.message ?? "", actions: actions), on: .root) + } } }) diff --git a/Telegram-iOS/ApplicationContext.swift b/Telegram-iOS/ApplicationContext.swift index 2edd30eac3..8c81c96174 100644 --- a/Telegram-iOS/ApplicationContext.swift +++ b/Telegram-iOS/ApplicationContext.swift @@ -46,6 +46,7 @@ private struct PasscodeState: Equatable { } final class AuthorizedApplicationContext { + let sharedApplicationContext: SharedApplicationContext let mainWindow: Window1 let lockedCoveringView: LockedWindowCoveringView @@ -99,7 +100,9 @@ final class AuthorizedApplicationContext { private var showCallsTabDisposable: Disposable? private var enablePostboxTransactionsDiposable: Disposable? - init(mainWindow: Window1, watchManagerArguments: Signal, context: AccountContext, accountManager: AccountManager, showCallsTab: Bool, reinitializedNotificationSettings: @escaping () -> Void) { + init(sharedApplicationContext: SharedApplicationContext, mainWindow: Window1, watchManagerArguments: Signal, context: AccountContext, accountManager: AccountManager, showCallsTab: Bool, reinitializedNotificationSettings: @escaping () -> Void) { + self.sharedApplicationContext = sharedApplicationContext + setupLegacyComponents(context: context) let presentationData = context.sharedContext.currentPresentationData.with { $0 } diff --git a/submodules/Postbox b/submodules/Postbox index 5debb55eb0..eca5668fc9 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit 5debb55eb0cd0154b866857476bdfb8122308664 +Subproject commit eca5668fc9834be348e65edde3f4ec07eeffef0c diff --git a/submodules/TelegramCore b/submodules/TelegramCore index eb72b51295..fdcc098f80 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit eb72b51295e0b0b937d4c0af59adb4fdce4d67a7 +Subproject commit fdcc098f8050834dd936f53a4476ac529abe6a58 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index ae83518e5a..40ad8ff628 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit ae83518e5a5fc2b79a9425891ad33962c3066ff9 +Subproject commit 40ad8ff62822372c08d7b4cb726316e5d0e5ac71 From 7ba7a3a37fa7ebe9ae44dace04f3391b3aa5e64e Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 26 Mar 2019 17:29:57 +0400 Subject: [PATCH 4/5] Update localization --- Telegram-iOS/en.lproj/Localizable.strings | 2 +- submodules/TelegramUI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 23fa8b41d0..8040c12726 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -3928,6 +3928,7 @@ Unused sets are archived when you add more."; "Undo.Undo" = "Undo"; "Undo.ChatDeleted" = "Chat deleted"; "Undo.ChatCleared" = "Chat cleared"; +"Undo.ChatClearedForBothSides" = "Chat cleared for both sides"; "Undo.SecretChatDeleted" = "Secret Chat deleted"; "Undo.LeftChannel" = "Left channel"; "Undo.LeftGroup" = "Left group"; @@ -4202,4 +4203,3 @@ Unused sets are archived when you add more."; "Settings.ChangePhoneNumber" = "Change Number"; "Undo.ChatDeletedForBothSides" = "Chat deleted for both sides"; -"Undo.MessagesDeletedForBothSides" = "Chat cleared for both sides"; diff --git a/submodules/TelegramUI b/submodules/TelegramUI index cf65440d8d..44ccb031eb 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit cf65440d8d76b223c80fe273a19aef619c5a2828 +Subproject commit 44ccb031eb2ee52628e6f2710a178bdb4f3041b5 From d8d136549642e04cf8585a168c92e0b548013538 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Tue, 26 Mar 2019 18:06:29 +0400 Subject: [PATCH 5/5] Add signingCertificate option --- fastlane/Fastfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index f75068ddbd..f8d9f1f6fa 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -13,6 +13,7 @@ app_identifier_llc = [ base_app_identifier_llc + ".watchkitapp.watchkitextension", base_app_identifier_llc + ".NotificationService" ] +signing_identity_llc = "iPhone Distribution: Digital Fortress LLC (C67CF9S4VU)" lane :do_build_app do |options| gym( @@ -31,7 +32,8 @@ lane :do_build_app do |options| iCloudContainerEnvironment: "Production", provisioningProfiles: options[:provisioningProfiles], stripSwiftSymbols: true, - uploadBitcode: false + uploadBitcode: false, + signingCertificate: options[:signingCertificate] } ) end @@ -47,6 +49,7 @@ lane :build_for_appstore do |options| export_method: "app-store", build_number: commit_count_string, commit_id: commit[:commit_hash], + signingCertificate: signing_identity_llc, provisioningProfiles: { base_app_identifier_llc => "match AppStore " + base_app_identifier_llc, base_app_identifier_llc + ".Share" => "match AppStore " + base_app_identifier_llc + ".Share",