Removed preference and popup onboarding the user

Default persistent private browsing to off.
brave · Aug 3, 2023 · 8c3d685 · 8c3d685
1 parent e099feb
commit 8c3d685
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 30 deletions.
diff --git a/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift b/Sources/Brave/Frontend/Browser/Tabs/TabTray/TabTrayController.swift
@@ -624,22 +624,6 @@ class TabTrayController: LoadingViewController {
         tabTrayView.collectionView.reloadData()
         navigationController?.setNavigationBarHidden(false, animated: false)
       }
-
-      if Preferences.Privacy.shouldShowPersistentPrivateBrowsingAlert.value {
-        Preferences.Privacy.shouldShowPersistentPrivateBrowsingAlert.value = false
-
-        let alert = UIAlertController(title: Strings.persistentPrivateBrowsingAlertTitle, message: Strings.persistentPrivateBrowsingAlertMessage, preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: Strings.yes, style: .default) { [unowned self] _ in
-          Preferences.Privacy.persistentPrivateBrowsing.value = true
-          self.tabManager.saveAllTabs()
-        })
-
-        alert.addAction(UIAlertAction(title: Strings.no, style: .cancel) { _ in
-          Preferences.Privacy.persistentPrivateBrowsing.value = false
-        })
-
-        self.present(alert, animated: true)
-      }
     } else {
       tabTrayView.hidePrivateModeInfo()
 

diff --git a/Sources/Brave/Frontend/ClientPreferences.swift b/Sources/Brave/Frontend/ClientPreferences.swift
@@ -126,9 +126,7 @@ extension Preferences {
     /// Forces all private tabs
     public static let privateBrowsingOnly = Option<Bool>(key: "privacy.private-only", default: false)
     /// Whether or not private browsing tabs can be session restored (persistent private browsing)
-    public static let persistentPrivateBrowsing = Option<Bool>(key: "privacy.private-browsing-persistence", default: true)
-    /// Whether or not a persistent private browsing alert was shown to existing users
-    public static let shouldShowPersistentPrivateBrowsingAlert = Option<Bool>(key: "privacy.private-browsing-persistence-alert", default: false)
+    public static let persistentPrivateBrowsing = Option<Bool>(key: "privacy.private-browsing-persistence", default: false)
     /// Blocks all cookies and access to local storage
     static let blockAllCookies = Option<Bool>(key: "privacy.block-all-cookies", default: false)
     /// The toggles states for clear private data screen

diff --git a/Sources/Brave/Frontend/Settings/Shields/OtherPrivacySettingsSectionView.swift b/Sources/Brave/Frontend/Settings/Shields/OtherPrivacySettingsSectionView.swift
@@ -58,17 +58,15 @@ struct OtherPrivacySettingsSectionView: View {
         OptionToggleView(title: Strings.persistentPrivateBrowsing,
                          subtitle: nil,
                          option: Preferences.Privacy.persistentPrivateBrowsing) { newValue in
-          if !Preferences.Privacy.shouldShowPersistentPrivateBrowsingAlert.value {
-            Task { @MainActor in
-              if newValue {
-                settings.tabManager.saveAllTabs()
-              } else {
-                let tabs = settings.tabManager.allTabs.filter({ $0.isPrivate })
-                SessionTab.deleteAll(tabIds: tabs.map({ $0.id }))
-
-                if !settings.tabManager.privateBrowsingManager.isPrivateBrowsing {
-                  settings.tabManager.willSwitchTabMode(leavingPBM: true)
-                }
+          Task { @MainActor in
+            if newValue {
+              settings.tabManager.saveAllTabs()
+            } else {
+              let tabs = settings.tabManager.allTabs.filter({ $0.isPrivate })
+              SessionTab.deleteAll(tabIds: tabs.map({ $0.id }))
+
+              if !settings.tabManager.privateBrowsingManager.isPrivateBrowsing {
+                settings.tabManager.willSwitchTabMode(leavingPBM: true)
               }
             }
           }