From 66558337196e944d12e3bd819415466b8670c2c1 Mon Sep 17 00:00:00 2001
From: Mauro <34335419+Velin92@users.noreply.github.com>
Date: Wed, 19 Jun 2024 16:05:38 +0200
Subject: [PATCH] Enable draft restore (#2943)

---
 ElementX/Sources/Application/AppSettings.swift              | 4 ----
 .../Sources/Screens/RoomScreen/RoomScreenViewModel.swift    | 3 ---
 .../DeveloperOptionsScreenModels.swift                      | 1 -
 .../View/DeveloperOptionsScreen.swift                       | 6 ------
 changelog.d/pr-2943.feature                                 | 1 +
 5 files changed, 1 insertion(+), 14 deletions(-)
 create mode 100644 changelog.d/pr-2943.feature

diff --git a/ElementX/Sources/Application/AppSettings.swift b/ElementX/Sources/Application/AppSettings.swift
index 0dc9640ec..d8fa41a11 100644
--- a/ElementX/Sources/Application/AppSettings.swift
+++ b/ElementX/Sources/Application/AppSettings.swift
@@ -44,7 +44,6 @@ final class AppSettings {
         
         // Feature flags
         case publicSearchEnabled
-        case draftRestoringEnabled
         case fuzzyRoomListSearchEnabled
     }
     
@@ -271,9 +270,6 @@ final class AppSettings {
     @UserPreference(key: UserDefaultsKeys.publicSearchEnabled, defaultValue: isDevelopmentBuild, storageType: .volatile)
     var publicSearchEnabled
     
-    @UserPreference(key: UserDefaultsKeys.draftRestoringEnabled, defaultValue: false, storageType: .userDefaults(store))
-    var draftRestoringEnabled
-    
     @UserPreference(key: UserDefaultsKeys.fuzzyRoomListSearchEnabled, defaultValue: false, storageType: .userDefaults(store))
     var fuzzyRoomListSearchEnabled
         
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
index dec557632..3605b1b75 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenViewModel.swift
@@ -134,9 +134,6 @@ class RoomScreenViewModel: RoomScreenViewModelType, RoomScreenViewModelProtocol
     // MARK: - Public
     
     func loadDraft() {
-        guard appSettings.draftRestoringEnabled else {
-            return
-        }
         actionsSubject.send(.composer(action: .loadDraft))
     }
     
diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
index 508ea1f85..249f3053e 100644
--- a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
+++ b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift
@@ -46,7 +46,6 @@ enum DeveloperOptionsScreenViewAction {
 protocol DeveloperOptionsProtocol: AnyObject {
     var logLevel: TracingConfiguration.LogLevel { get set }
     var hideUnreadMessagesBadge: Bool { get set }
-    var draftRestoringEnabled: Bool { get set }
     var elementCallBaseURL: URL { get set }
     var fuzzyRoomListSearchEnabled: Bool { get set }
 }
diff --git a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
index 39c8e6465..444fba952 100644
--- a/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
+++ b/ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift
@@ -36,12 +36,6 @@ struct DeveloperOptionsScreen: View {
                     Text("Fuzzy searching")
                 }
             }
-            
-            Section("Room") {
-                Toggle(isOn: $context.draftRestoringEnabled) {
-                    Text("Allow drafts to be restored")
-                }
-            }
                                     
             Section("Element Call") {
                 TextField(context.elementCallBaseURL.absoluteString, text: $elementCallBaseURLString)
diff --git a/changelog.d/pr-2943.feature b/changelog.d/pr-2943.feature
new file mode 100644
index 000000000..8d1786f1b
--- /dev/null
+++ b/changelog.d/pr-2943.feature
@@ -0,0 +1 @@
+Draft restoring is enabled by default.
\ No newline at end of file