Remove FXIOS-11952 ⁃ Remove jump back in feature flag

BrowserKit/Sources/Shared/Prefs.swift

@@ -80,7 +80,6 @@ public struct PrefsKeys {
         public static let DebugSuffixKey = "DebugKey"
         public static let FirefoxSuggest = "FirefoxSuggest"
         public static let InactiveTabs = "InactiveTabsUserPrefsKey"
-        public static let JumpBackInSection = "JumpBackInSectionUserPrefsKey"
         public static let SearchBarPosition = "SearchBarPositionUsersPrefsKey"
         public static let SentFromFirefox = "SentFromFirefoxUserPrefsKey"
     }
@@ -109,6 +108,7 @@ public struct PrefsKeys {
     public struct UserFeatureFlagPrefs {
         public static let ASPocketStories = "ASPocketStoriesUserPrefsKey"
         public static let BookmarksSection = "BookmarksSectionUserPrefsKey"
+        public static let JumpBackInSection = "JumpBackInSectionUserPrefsKey"
         public static let SponsoredShortcuts = "SponsoredShortcutsUserPrefsKey"
         public static let StartAtHome = "StartAtHomeUserPrefsKey"
         public static let TopSiteSection = "TopSitesUserPrefsKey"

firefox-ios/Client/FeatureFlags/NimbusFlaggableFeature.swift

@@ -24,7 +24,6 @@ enum NimbusFeatureFlagID: String, CaseIterable {
     case firefoxSuggestFeature
     case homepageRebuild
     case inactiveTabs
-    case jumpBackIn
     case loginAutofill
     case menuRefactor
     case menuRefactorHint
@@ -109,8 +108,6 @@ struct NimbusFlaggableFeature: HasNimbusSearchBar {
             return FlagKeys.FirefoxSuggest
         case .inactiveTabs:
             return FlagKeys.InactiveTabs
-        case .jumpBackIn:
-            return FlagKeys.JumpBackInSection
         case .sentFromFirefox:
             return FlagKeys.SentFromFirefox
         // Cases where users do not have the option to manipulate a setting.

firefox-ios/Client/Frontend/Home/Homepage Rebuild/JumpBackIn/JumpBackInSectionState.swift

@@ -27,7 +27,7 @@ struct JumpBackInSectionState: StateType, Equatable, Hashable {
         windowUUID: WindowUUID
     ) {
         // TODO: FXIOS-11412 / 11226 - Move profile dependency and show section also based on feature flags
-        let shouldShowSection = profile.prefs.boolForKey(PrefsKeys.FeatureFlags.JumpBackInSection) ?? true
+        let shouldShowSection = profile.prefs.boolForKey(PrefsKeys.UserFeatureFlagPrefs.JumpBackInSection) ?? true
         self.init(
             windowUUID: windowUUID,
             jumpBackInTabs: [],

firefox-ios/Client/Frontend/Home/JumpBackIn/JumpBackInViewModel.swift

@@ -307,9 +307,8 @@ extension JumpBackInViewModel: HomepageViewModelProtocol {
     }
 
     var isEnabled: Bool {
-        guard featureFlags.isFeatureEnabled(.jumpBackIn, checking: .buildAndUser) else { return false }
-
-        return !isPrivate
+        let isEnabled = profile.prefs.boolForKey(PrefsKeys.UserFeatureFlagPrefs.JumpBackInSection) ?? true
+        return !isPrivate && isEnabled
     }
 
     func numberOfItemsInSection() -> Int {

firefox-ios/Client/Frontend/Settings/HomepageSettings/HomePageSettingViewController.swift

@@ -15,10 +15,6 @@ class HomePageSettingViewController: SettingsTableViewController, FeatureFlaggab
     var hasHomePage = false
     var wallpaperManager: WallpaperManagerInterface
 
-    var isJumpBackInSectionEnabled: Bool {
-        return featureFlags.isFeatureEnabled(.jumpBackIn, checking: .buildOnly)
-    }
-
     var isWallpaperSectionEnabled: Bool {
         return wallpaperManager.canSettingsBeShown
     }
@@ -128,27 +124,27 @@ class HomePageSettingViewController: SettingsTableViewController, FeatureFlaggab
             format: .Settings.Homepage.CustomizeFirefoxHome.ThoughtProvokingStoriesSubtitle,
             PocketAppName.shortName.rawValue)
 
-        let jumpBackInSetting = BoolSetting(
-            with: .jumpBackIn,
-            titleText: NSAttributedString(string: .Settings.Homepage.CustomizeFirefoxHome.JumpBackIn)
-        ) { value in
-            store.dispatch(
-                JumpBackInAction(
-                    isEnabled: value,
-                    windowUUID: self.windowUUID,
-                    actionType: JumpBackInActionType.toggleShowSectionSetting
-                )
-            )
-        }
-
         // Section ordering
         sectionItems.append(TopSitesSettings(settings: self))
 
-        if isJumpBackInSectionEnabled {
+        if let profile {
+            let jumpBackInSetting = BoolSetting(
+                prefs: profile.prefs,
+                theme: themeManager.getCurrentTheme(for: windowUUID),
+                prefKey: PrefsKeys.UserFeatureFlagPrefs.JumpBackInSection,
+                defaultValue: true,
+                titleText: .Settings.Homepage.CustomizeFirefoxHome.JumpBackIn
+            ) { value in
+                store.dispatch(
+                    JumpBackInAction(
+                        isEnabled: value,
+                        windowUUID: self.windowUUID,
+                        actionType: JumpBackInActionType.toggleShowSectionSetting
+                    )
+                )
+            }
             sectionItems.append(jumpBackInSetting)
-        }
 
-        if let profile {
             let bookmarksSetting = BoolSetting(
                 prefs: profile.prefs,
                 theme: themeManager.getCurrentTheme(for: windowUUID),

firefox-ios/Client/Nimbus/NimbusFeatureFlagLayer.swift

@@ -40,9 +40,6 @@ final class NimbusFeatureFlagLayer {
         case .creditCardAutofillStatus:
             return checkNimbusForCreditCardAutofill(for: featureID, from: nimbus)
 
-        case .jumpBackIn:
-            return checkHomescreenSectionsFeature(for: featureID, from: nimbus)
-
         case .firefoxSuggestFeature:
             return checkFirefoxSuggestFeature(from: nimbus)
 
@@ -183,22 +180,6 @@ final class NimbusFeatureFlagLayer {
         }
     }
 
-    private func checkHomescreenSectionsFeature(for featureID: NimbusFeatureFlagID,
-                                                from nimbus: FxNimbus
-    ) -> Bool {
-        let config = nimbus.features.homescreenFeature.value()
-        var nimbusID: HomeScreenSection
-
-        switch featureID {
-        case .jumpBackIn: nimbusID = HomeScreenSection.jumpBackIn
-        default: return false
-        }
-
-        guard let status = config.sectionsEnabled[nimbusID] else { return false }
-
-        return status
-    }
-
     private func checkHomepageFeature(from nimbus: FxNimbus) -> Bool {
         let config = nimbus.features.homepageRebuildFeature.value()
         return config.enabled

firefox-ios/Client/Telemetry/TelemetryWrapper.swift

@@ -306,7 +306,7 @@ class TelemetryWrapper: TelemetryWrapperProtocol, FeatureFlaggable {
         }
 
         // Homepage section preferences
-        let isJumpBackInEnabled = featureFlags.isFeatureEnabled(.jumpBackIn, checking: .buildAndUser)
+        let isJumpBackInEnabled = profile.prefs.boolForKey(PrefsKeys.UserFeatureFlagPrefs.JumpBackInSection) ?? true
         GleanMetrics.Preferences.jumpBackIn.set(isJumpBackInEnabled)
 
         let isBookmarksEnabled = prefs.boolForKey(PrefsKeys.UserFeatureFlagPrefs.BookmarksSection) ?? true

firefox-ios/firefox-ios-tests/Tests/ClientTests/FeatureFlagManagerTests.swift

@@ -36,8 +36,6 @@ class FeatureFlagManagerTests: XCTestCase, FeatureFlaggable {
         XCTAssertTrue(featureFlags.isFeatureEnabled(.bottomSearchBar, checking: .userOnly))
         XCTAssertTrue(featureFlags.isFeatureEnabled(.inactiveTabs, checking: .buildOnly))
         XCTAssertTrue(featureFlags.isFeatureEnabled(.inactiveTabs, checking: .userOnly))
-        XCTAssertTrue(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .buildOnly))
-        XCTAssertTrue(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .userOnly))
         XCTAssertTrue(featureFlags.isFeatureEnabled(.reportSiteIssue, checking: .buildOnly))
         XCTAssertTrue(featureFlags.isFeatureEnabled(.reportSiteIssue, checking: .userOnly))
     }
@@ -46,22 +44,6 @@ class FeatureFlagManagerTests: XCTestCase, FeatureFlaggable {
         XCTAssertEqual(featureFlags.getCustomState(for: .searchBarPosition), SearchBarPosition.top)
     }
 
-    // Changing the prefs manually, to make sure settings are respected through
-    // the FFMs interface
-    func testManagerRespectsProfileChangesForBoolSettings() {
-        let mockProfile = MockProfile(databasePrefix: "FeatureFlagsManagerTests_")
-        mockProfile.prefs.clearAll()
-        LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: mockProfile)
-
-        XCTAssertTrue(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .buildOnly))
-        XCTAssertTrue(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .userOnly))
-        // Changing the prefs manually, to make sure settings are respected through
-        // the FFMs interface
-        mockProfile.prefs.setBool(false, forKey: PrefsKeys.FeatureFlags.JumpBackInSection)
-        XCTAssertTrue(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .buildOnly))
-        XCTAssertFalse(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .userOnly))
-    }
-
     // Changing the prefs manually, to make sure settings are respected through
     // the FFMs interface
     func testManagerRespectsProfileChangesForCustomSettings() {
@@ -76,14 +58,6 @@ class FeatureFlagManagerTests: XCTestCase, FeatureFlaggable {
         XCTAssertEqual(featureFlags.getCustomState(for: .searchBarPosition), SearchBarPosition.bottom)
     }
 
-    func testManagerInterfaceForUpdatingBoolFlags() {
-        XCTAssertTrue(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .buildOnly))
-        XCTAssertTrue(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .userOnly))
-        featureFlags.set(feature: .jumpBackIn, to: false)
-        XCTAssertTrue(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .buildOnly))
-        XCTAssertFalse(featureFlags.isFeatureEnabled(.jumpBackIn, checking: .userOnly))
-    }
-
     func testManagerInterfaceForUpdatingCustomFlags() {
         // Search Bar
         XCTAssertEqual(featureFlags.getCustomState(for: .searchBarPosition), SearchBarPosition.top)

firefox-ios/nimbus-features/homescreenFeature.yaml

@@ -9,7 +9,6 @@ features:
         type: Map<HomeScreenSection, Boolean>
         default:
           {
-            "jump-back-in": true,
             "recent-explorations": false,
           }
       prefer-switch-to-open-tab:
@@ -22,15 +21,13 @@ features:
       - channel: developer
         value: {
           "sections-enabled": {
-            "jump-back-in": true,
             "recent-explorations": false,
           },
           "prefer-switch-to-open-tab": true
         }
       - channel: beta
         value: {
           "sections-enabled": {
-            "jump-back-in": true,
             "recent-explorations": false,
           },
           "prefer-switch-to-open-tab": false
@@ -40,7 +37,5 @@ enums:
   HomeScreenSection:
     description: The identifiers for the sections of the homescreen.
     variants:
-      jump-back-in:
-        description: The tabs the user was looking immediately before being interrupted.
       recent-explorations:
         description: The tab groups