From ec15b312631914edbfee6370ed9d84ff82cb3828 Mon Sep 17 00:00:00 2001
From: Peter <>
Date: Tue, 15 Jan 2019 19:21:17 +0400
Subject: [PATCH] Update submodules

---
 Telegram-iOS/AppDelegate.swift            | 20 ++++++++++----------
 Telegram-iOS/en.lproj/Localizable.strings |  2 ++
 submodules/Display                        |  2 +-
 submodules/TelegramCore                   |  2 +-
 submodules/TelegramUI                     |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/Telegram-iOS/AppDelegate.swift b/Telegram-iOS/AppDelegate.swift
index 8242180649..4ee6899f3c 100644
--- a/Telegram-iOS/AppDelegate.swift
+++ b/Telegram-iOS/AppDelegate.swift
@@ -366,6 +366,16 @@ private enum QueuedWakeup: Int32 {
             return true
         }
         
+        #if DEBUG
+        LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: true, redactSensitiveData: true)
+        #else
+        if BuildConfig.shared().isInternalBuild {
+            LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
+        } else {
+            LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
+        }
+        #endif
+        
         let rootPath = rootPathForBasePath(appGroupUrl.path)
         performAppGroupUpgrades(appGroupPath: appGroupUrl.path, rootPath: rootPath)
         
@@ -414,16 +424,6 @@ private enum QueuedWakeup: Int32 {
         
         telegramUIDeclareEncodables()
         
-        #if DEBUG
-        LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: true, redactSensitiveData: true)
-        #else
-        if BuildConfig.shared().isInternalBuild {
-            LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
-        } else {
-            LoggingSettings.defaultSettings = LoggingSettings(logToFile: true, logToConsole: false, redactSensitiveData: true)
-        }
-        #endif
-        
         GlobalExperimentalSettings.isAppStoreBuild = BuildConfig.shared().isAppStoreBuild
         
         GlobalExperimentalSettings.enableFeed = false
diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings
index b7b7978334..60022c8bf8 100644
--- a/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram-iOS/en.lproj/Localizable.strings
@@ -2826,6 +2826,8 @@ Unused sets are archived when you add more.";
 
 "Group.Setup.HistoryVisibleHelp" = "New members will see messages that were sent before they joined.";
 "Group.Setup.HistoryHiddenHelp" = "New members won't see earlier messages.";
+"Group.Setup.BasicHistoryHiddenHelp" = "New members won't see more than 100 previous messages.";
+
 
 "Channel.AdminLog.MessageGroupPreHistoryVisible" = "%@ made the group history visible for new members";
 "Channel.AdminLog.MessageGroupPreHistoryHidden" = "%@ made the group history hidden from new members";
diff --git a/submodules/Display b/submodules/Display
index a533f7dd71..1df1405bd2 160000
--- a/submodules/Display
+++ b/submodules/Display
@@ -1 +1 @@
-Subproject commit a533f7dd716dd8e059b0e365e72867a9b6fb77a9
+Subproject commit 1df1405bd234c7498df5f42c1bd180244afb3285
diff --git a/submodules/TelegramCore b/submodules/TelegramCore
index 0341c221f6..ae844e1a20 160000
--- a/submodules/TelegramCore
+++ b/submodules/TelegramCore
@@ -1 +1 @@
-Subproject commit 0341c221f6c6d68a6054482e1d10d16bc3f587e2
+Subproject commit ae844e1a203745452ea630470db519dc152c0765
diff --git a/submodules/TelegramUI b/submodules/TelegramUI
index de668ae9c2..84d40aa79d 160000
--- a/submodules/TelegramUI
+++ b/submodules/TelegramUI
@@ -1 +1 @@
-Subproject commit de668ae9c2804130e5135ec085081670bcb10e2d
+Subproject commit 84d40aa79da30f86cb62e0a2ccfee3750979c02a