From a3c747bde2a88f3e10b5deb1992006a18659fe0d Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 16 Jan 2019 21:33:20 +0400 Subject: [PATCH 1/3] Update submodules --- Telegram-iOS/SnapshotEnvironment.swift | 4 ++-- submodules/Display | 2 +- submodules/TelegramUI | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram-iOS/SnapshotEnvironment.swift b/Telegram-iOS/SnapshotEnvironment.swift index 6e2cf9636c..05a4cdc687 100644 --- a/Telegram-iOS/SnapshotEnvironment.swift +++ b/Telegram-iOS/SnapshotEnvironment.swift @@ -89,9 +89,9 @@ func snapshotEnvironment(application: UIApplication, mainWindow: UIWindow, statu let _ = updatePresentationThemeSettingsInteractively(postbox: result!.postbox, { _ in switch theme { case .day: - return PresentationThemeSettings(chatWallpaper: .color(0xffffff), chatWallpaperMode: .still, theme: .builtin(.day), themeAccentColor: nil, fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), disableAnimations: false) + return PresentationThemeSettings(chatWallpaper: .color(0xffffff), chatWallpaperOptions: [], theme: .builtin(.day), themeAccentColor: nil, fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), disableAnimations: false) case .night: - return PresentationThemeSettings(chatWallpaper: .color(0x000000), chatWallpaperMode: .still, theme: .builtin(.nightAccent), themeAccentColor: nil, fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), disableAnimations: false) + return PresentationThemeSettings(chatWallpaper: .color(0x000000), chatWallpaperOptions: [], theme: .builtin(.nightAccent), themeAccentColor: nil, fontSize: .regular, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .none, theme: .nightAccent), disableAnimations: false) } }).start() 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/TelegramUI b/submodules/TelegramUI index c9631285bf..06fc9e6aab 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit c9631285bf9af4712b9c0b966f50d6e2ec1ac314 +Subproject commit 06fc9e6aabeeb2daa488ad95fb7984477fca5d9e From faf18be8134939362be1602f005563b42825ee8d Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 17 Jan 2019 15:22:32 +0400 Subject: [PATCH 2/3] Update submodules --- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 06fc9e6aab..1270d99fc2 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 06fc9e6aabeeb2daa488ad95fb7984477fca5d9e +Subproject commit 1270d99fc2f737c30efa43e3567fac869f843afb From 73eaa6f07720003ef3a7507145ad2f0c987e4d04 Mon Sep 17 00:00:00 2001 From: Peter <> Date: Thu, 17 Jan 2019 21:45:20 +0400 Subject: [PATCH 3/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