Bugfix FXIOS-10429 - Private tabs are not restored after force crash (#…

…22865)
mozilla-mobile · Nov 6, 2024 · d53086a · d53086a
1 parent 2111b53
commit d53086a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/firefox-ios/Client/Frontend/Browser/Tabs/Action/TabTrayAction.swift b/firefox-ios/Client/Frontend/Browser/Tabs/Action/TabTrayAction.swift
@@ -31,4 +31,5 @@ enum  TabTrayActionType: ActionType {
     case didLoadTabTray
     case dismissTabTray
     case firefoxAccountChanged
+    case closePrivateTabsSettingToggled
 }
diff --git a/firefox-ios/Client/Frontend/Browser/Tabs/Middleware/TabManagerMiddleware.swift b/firefox-ios/Client/Frontend/Browser/Tabs/Middleware/TabManagerMiddleware.swift
@@ -28,7 +28,7 @@ class TabManagerMiddleware {
         } else if let action = action as? TabTrayAction {
             self.resolveTabTrayActions(action: action, state: state)
         } else if let action = action as? TabPanelViewAction {
-            self.resovleTabPanelViewActions(action: action, state: state)
+            self.resolveTabPanelViewActions(action: action, state: state)
         } else if let action = action as? MainMenuAction {
             self.resolveMainMenuActions(with: action, appState: state)
         } else if let action = action as? HeaderAction {
@@ -90,12 +90,14 @@ class TabManagerMiddleware {
             guard let panelType = action.panelType else { return }
             changePanel(panelType, uuid: action.windowUUID)
 
+        case TabTrayActionType.closePrivateTabsSettingToggled:
+            preserveTabs(uuid: action.windowUUID)
         default:
             break
         }
     }
 
-    private func resovleTabPanelViewActions(action: TabPanelViewAction, state: AppState) {
+    private func resolveTabPanelViewActions(action: TabPanelViewAction, state: AppState) {
         switch action.actionType {
         case TabPanelViewActionType.tabPanelDidLoad:
             let isPrivate = action.panelType == .privateTabs
@@ -968,4 +970,9 @@ class TabManagerMiddleware {
             )
         }
     }
+
+    private func preserveTabs(uuid: WindowUUID) {
+        let tabManager = tabManager(for: uuid)
+        tabManager.preserveTabs()
+    }
 }
diff --git a/firefox-ios/Client/Frontend/Settings/Main/AppSettingsTableViewController.swift b/firefox-ios/Client/Frontend/Settings/Main/AppSettingsTableViewController.swift
@@ -329,7 +329,11 @@ class AppSettingsTableViewController: SettingsTableViewController,
                         prefKey: PrefsKeys.Settings.closePrivateTabs,
                         defaultValue: true,
                         titleText: .AppSettingsClosePrivateTabsTitle,
-                        statusText: .AppSettingsClosePrivateTabsDescription)
+                        statusText: .AppSettingsClosePrivateTabsDescription) { _ in
+                            let action = TabTrayAction(windowUUID: self.windowUUID,
+                                                       actionType: TabTrayActionType.closePrivateTabsSettingToggled)
+                            store.dispatch(action)
+            }
         ]
 
         privacySettings.append(ContentBlockerSetting(settings: self, settingsDelegate: parentCoordinator))