Fix private-tab mode message not showing all the time.

Fix private tab deleting when exiting persistence mode.
brave · Jun 19, 2023 · 1e75e0f · 1e75e0f
1 parent 2c5e7bb
commit 1e75e0f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift b/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift
@@ -603,7 +603,7 @@ class TabTrayController: LoadingViewController {
       tabTypeSelector.selectedSegmentIndex = 0
       tabTypeSelector.sendActions(for: UIControl.Event.valueChanged)
 
-      if !Preferences.Privacy.persistentPrivateBrowsing.value {
+      if !Preferences.Privacy.persistentPrivateBrowsing.value || tabManager.tabsForCurrentMode.isEmpty {
         tabTrayView.showPrivateModeInfo()
         // New private tab is created immediately to reflect changes on NTP.
         // If user drags the modal down or dismisses it, a new private tab will be ready.

diff --git a/Sources/Brave/Frontend/Settings/Shields/OtherPrivacySettingsSectionView.swift b/Sources/Brave/Frontend/Settings/Shields/OtherPrivacySettingsSectionView.swift
@@ -63,10 +63,10 @@ struct OtherPrivacySettingsSectionView: View {
               settings.tabManager.saveAllTabs()
             } else {
               let tabs = settings.tabManager.allTabs.filter({ $0.isPrivate })
-              if settings.tabManager.privateBrowsingManager.isPrivateBrowsing {
-                SessionTab.deleteAll(tabIds: tabs.map({ $0.id }))
-              } else {
-                settings.tabManager.removeTabs(tabs)
+              SessionTab.deleteAll(tabIds: tabs.map({ $0.id }))
+
+              if !settings.tabManager.privateBrowsingManager.isPrivateBrowsing {
+                settings.tabManager.willSwitchTabMode(leavingPBM: true)
               }
             }
           }