From 7998f29f4ebc13ac2b422a0fd8261aef68b1933c Mon Sep 17 00:00:00 2001
From: Ilya Laktyushin <ilya@laktyush.in>
Date: Mon, 6 Sep 2021 20:21:24 +0300
Subject: [PATCH] Theme editor improvements

---
 .../SettingsUI/Sources/Themes/EditThemeController.swift   | 2 +-
 submodules/TelegramCore/Sources/Themes.swift              | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift
index 25f019a1aa..39393c1807 100644
--- a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift
+++ b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift
@@ -663,7 +663,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
                                 })
                             }
                         case let .edit(info):
-                            let _ = (prepare |> then(updateTheme(account: context.account, accountManager: context.sharedContext.accountManager, theme: info.theme, title: state.title, slug: state.slug, resource: state.converting ? nil : themeResource, settings: settings, resetFile: state.converting ? true : false)
+                            let _ = (prepare |> then(updateTheme(account: context.account, accountManager: context.sharedContext.accountManager, theme: info.theme, title: state.title, slug: state.slug, resource: state.converting ? nil : themeResource, settings: settings)
                             |> deliverOnMainQueue)).start(next: { next in
                                 if case let .result(resultTheme) = next {
                                     let _ = applyTheme(accountManager: context.sharedContext.accountManager, account: context.account, theme: resultTheme).start()
diff --git a/submodules/TelegramCore/Sources/Themes.swift b/submodules/TelegramCore/Sources/Themes.swift
index 29cddd16c9..5c6ab6d937 100644
--- a/submodules/TelegramCore/Sources/Themes.swift
+++ b/submodules/TelegramCore/Sources/Themes.swift
@@ -357,7 +357,7 @@ public func createTheme(account: Account, title: String, resource: MediaResource
     }
 }
 
-public func updateTheme(account: Account, accountManager: AccountManager<TelegramAccountManagerTypes>, theme: TelegramTheme, title: String?, slug: String?, resource: MediaResource?, thumbnailData: Data? = nil, settings: TelegramThemeSettings?, resetFile: Bool = false) -> Signal<CreateThemeResult, CreateThemeError> {
+public func updateTheme(account: Account, accountManager: AccountManager<TelegramAccountManagerTypes>, theme: TelegramTheme, title: String?, slug: String?, resource: MediaResource?, thumbnailData: Data? = nil, settings: TelegramThemeSettings?) -> Signal<CreateThemeResult, CreateThemeError> {
     guard title != nil || slug != nil || resource != nil else {
         return .complete()
     }
@@ -370,8 +370,6 @@ public func updateTheme(account: Account, accountManager: AccountManager<Telegra
     }
     if let _ = resource {
         flags |= 1 << 2
-    } else if resetFile {
-        flags |= 1 << 2
     }
     var inputSettings: Api.InputThemeSettings?
     if let settings = settings {
@@ -391,9 +389,7 @@ public func updateTheme(account: Account, accountManager: AccountManager<Telegra
     }
     |> mapToSignal { result -> Signal<CreateThemeResult, CreateThemeError> in
         let inputDocument: Api.InputDocument?
-        if resetFile {
-            inputDocument = .inputDocumentEmpty
-        } else if let status = result {
+        if let status = result {
             switch status {
                 case let .complete(file):
                     if let resource = file.resource as? CloudDocumentMediaResource {