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/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 3605fc6609..9f194e12c9 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/TelegramCore b/submodules/TelegramCore index c45aa06aa7..f698cfce37 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit c45aa06aa7fef4f0a50c6d31cc37738729e1092f +Subproject commit f698cfce379e924e8b650dca8a01cf4c85bcccac diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 1270d99fc2..4acdfbfb74 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 1270d99fc2f737c30efa43e3567fac869f843afb +Subproject commit 4acdfbfb74e1d352b1b31fe24ec75cc36ed68fbb