ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-01 02:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ilya Laktyushin 2019-01-17 22:07:26 +04:00
commit 06dec6c3c9
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram-iOS/AppDelegate.swift
View File

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

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

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

2
submodules/TelegramCore

@ -1 +1 @@
Subproject commit c45aa06aa7fef4f0a50c6d31cc37738729e1092f
Subproject commit f698cfce379e924e8b650dca8a01cf4c85bcccac

2
submodules/TelegramUI

@ -1 +1 @@
Subproject commit 1270d99fc2f737c30efa43e3567fac869f843afb
Subproject commit 4acdfbfb74e1d352b1b31fe24ec75cc36ed68fbb