From 5f7d33371b3d5511ee28a2036a9fb9c91aed8043 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 5 Feb 2019 22:27:59 +0400 Subject: [PATCH 1/2] Update submodules --- Telegram-iOS/LegacyPreferencesImport.swift | 4 ++-- submodules/Display | 2 +- submodules/Postbox | 2 +- submodules/TelegramCore | 2 +- submodules/TelegramUI | 2 +- submodules/libtgvoip | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Telegram-iOS/LegacyPreferencesImport.swift b/Telegram-iOS/LegacyPreferencesImport.swift index dee02ff582..abfa96eb6a 100644 --- a/Telegram-iOS/LegacyPreferencesImport.swift +++ b/Telegram-iOS/LegacyPreferencesImport.swift @@ -192,7 +192,7 @@ func importLegacyPreferences(account: TemporaryAccount, documentsPath: String, d settings.chatWallpaper = .color(0x18222D) default: settings.theme = .builtin(.dayClassic) - settings.chatWallpaper = .builtin + settings.chatWallpaper = .builtin(WallpaperSettings()) } let fontSizeMap: [Int32: PresentationFontSize] = [ 14: .extraSmall, @@ -231,7 +231,7 @@ func importLegacyPreferences(account: TemporaryAccount, documentsPath: String, d } if let wallpaperInfo = wallpaperInfo as? TGBuiltinWallpaperInfo, wallpaperInfo.isDefault() { - settings.chatWallpaper = .builtin + settings.chatWallpaper = .builtin(WallpaperSettings()) } else if let wallpaperInfo = wallpaperInfo as? TGRemoteWallpaperInfo, let data = try? Data(contentsOf: URL(fileURLWithPath: documentsPath + "/wallpaper-data/_currentWallpaper.jpg")), let image = UIImage(data: data) { let url = wallpaperInfo.fullscreenUrl()! if let resource = resourceFromLegacyImageUrl(url) { diff --git a/submodules/Display b/submodules/Display index 3318892474..947810ca9c 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 331889247469b2f560c0854421f445c395e49a7b +Subproject commit 947810ca9cef45f04497d064ea6be876cfb524f5 diff --git a/submodules/Postbox b/submodules/Postbox index 61287e9f02..56fba0b515 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit 61287e9f023ef064f03b6552704db2334ddb8592 +Subproject commit 56fba0b5152ab2cb17dae825a272f8098b8c149a diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 69bab218df..03563113d1 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 69bab218dfb4bb6958e9e9701781e7ae14f3d0e4 +Subproject commit 03563113d1b2816dbae820bfc358c50169110156 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 6427a7109d..bd939e4bbd 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 6427a7109d3b25bea8056ddf4de2996b35d61da7 +Subproject commit bd939e4bbd17ab630a91034cd5b92f195cdf8037 diff --git a/submodules/libtgvoip b/submodules/libtgvoip index c4a48b3627..cfd62e66a8 160000 --- a/submodules/libtgvoip +++ b/submodules/libtgvoip @@ -1 +1 @@ -Subproject commit c4a48b3627f7d08c7be40dc63b84f8b16eaf281a +Subproject commit cfd62e66a825348ac51f49e5d20bf8827fef7a38 From d4ac8511f47e632331baa154b6b10c0f0bcaff53 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Tue, 5 Feb 2019 22:59:49 +0400 Subject: [PATCH 2/2] Update submodules --- submodules/TelegramUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramUI b/submodules/TelegramUI index d76ae96f0c..b6e2e46264 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit d76ae96f0c46934bc1032ee1ab97928f70bff75d +Subproject commit b6e2e462641f50d2494f1bfd827f86158863b87f