From 73eaa6f07720003ef3a7507145ad2f0c987e4d04 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Thu, 17 Jan 2019 21:45:20 +0400 Subject: [PATCH 1/3] Enable logging in testflight builds --- Telegram-iOS/AppDelegate.swift | 15 ++++++++++----- submodules/Display | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift index 4ee6899f3c..237b4a7134 100644 --- a/Telegram-iOS/AppDelegate.swift +++ b/Telegram-iOS/AppDelegate.swift @@ -366,15 +366,20 @@ private enum QueuedWakeup: Int32 { return true } + var isDebugConfiguration = false #if DEBUG - LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: true, redactSensitiveData: true) - #else - if BuildConfig.shared().isInternalBuild { + isDebugConfiguration = true + #endif + + if Bundle.main.appStoreReceiptURL?.lastPathComponent == "sandboxReceipt" { + isDebugConfiguration = true + } + + if isDebugConfiguration || BuildConfig.shared().isInternalBuild { LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true) } else { - LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true) + LoggingSettings.defaultSettings = LoggingSettings(logToFile: false, logToConsole: false, redactSensitiveData: true) } - #endif let rootPath = rootPathForBasePath(appGroupUrl.path) performAppGroupUpgrades(appGroupPath: appGroupUrl.path, rootPath: rootPath) diff --git a/submodules/Display b/submodules/Display index 1df1405bd2..02bca94d9d 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 1df1405bd234c7498df5f42c1bd180244afb3285 +Subproject commit 02bca94d9da397c147c14d61acb94cbfc9e58e75 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index ae844e1a20..c45aa06aa7 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit ae844e1a203745452ea630470db519dc152c0765 +Subproject commit c45aa06aa7fef4f0a50c6d31cc37738729e1092f diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 84d40aa79d..13899c4d89 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 84d40aa79da30f86cb62e0a2ccfee3750979c02a +Subproject commit 13899c4d8965d553560d6c9f4529b9d26cb4f0e3 From 2371de040beb9b4d593e2cf4e2b2262cf4bc2839 Mon Sep 17 00:00:00 2001 From: Peter Iakovlev Date: Thu, 17 Jan 2019 21:50:08 +0400 Subject: [PATCH 2/3] Update localization --- Telegram-iOS/en.lproj/Localizable.strings | 3 +-- submodules/Display | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index a04a6aecf4..5dc363f3cf 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -2545,9 +2545,8 @@ Unused sets are archived when you add more."; "Channel.AdminLog.BanReadMessages" = "Read Messages"; "Channel.AdminLog.BanSendMessages" = "Send Messages"; "Channel.AdminLog.BanSendMedia" = "Send Media"; -"Channel.AdminLog.BanSendStickers" = "Send Stickers"; +"Channel.AdminLog.BanSendStickersAndGifs" = "Send Stickers & GIFs"; "Channel.AdminLog.BanEmbedLinks" = "Embed Links"; -"Channel.AdminLog.BanSendGifs" = "Send GIFs"; "Channel.AdminLog.MessageRestricted" = "%@ changed restrictions for %@ (%@)"; "Channel.AdminLog.MessageAdmin" = "%@ changed privileges for %@ (%@)"; "Channel.AdminLog.ChangeInfo" = "Change Info"; diff --git a/submodules/Display b/submodules/Display index 679283d018..02bca94d9d 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 679283d018b3c0299ca9103f3048d9fae55e757a +Subproject commit 02bca94d9da397c147c14d61acb94cbfc9e58e75 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index ae844e1a20..f698cfce37 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit ae844e1a203745452ea630470db519dc152c0765 +Subproject commit f698cfce379e924e8b650dca8a01cf4c85bcccac diff --git a/submodules/TelegramUI b/submodules/TelegramUI index c9631285bf..2d8375de26 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit c9631285bf9af4712b9c0b966f50d6e2ec1ac314 +Subproject commit 2d8375de26041b9cb6243b5194bf5292c721c97c From 570b5178b54b9bf61f7152b1985ebcb840c3407c Mon Sep 17 00:00:00 2001 From: Peter Iakovlev Date: Thu, 17 Jan 2019 21:52:31 +0400 Subject: [PATCH 3/3] Update submodule --- submodules/TelegramUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 2d8375de26..4acdfbfb74 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 2d8375de26041b9cb6243b5194bf5292c721c97c +Subproject commit 4acdfbfb74e1d352b1b31fe24ec75cc36ed68fbb