Bugfix FXIOS-11139 [ToS] Incorrect settings are displayed after modifying the defaults values in Manage bottom sheet (#24300)

* FXIOS-11139 [Terms of service] Incorrect settings are displayed after modifying the defaults values in Manage bottom sheet

* Fixed SettingsTests

Author: dicarobinho

firefox-ios/Client/Application/AccessibilityIdentifiers.swift

@@ -713,7 +713,6 @@ struct AccessibilityIdentifiers {
         }
 
         struct SendData {
-            static let sendAnonymousUsageDataTitle = "SendAnonymousUsageData"
             static let sendTechnicalDataTitle = "SendTechnicalData"
             static let sendCrashReportsTitle = "SendCrashReports"
             static let sendDailyUsagePingTitle = "SendDailyUsagePing"

firefox-ios/Client/Frontend/Settings/Main/AppSettingsTableViewController.swift

@@ -54,7 +54,6 @@ class AppSettingsTableViewController: SettingsTableViewController,
     weak var parentCoordinator: SettingsFlowDelegate?
 
     // MARK: - Data Settings
-    private var sendAnonymousUsageDataSetting: BoolSetting?
     private var sendTechnicalDataSetting: BoolSetting?
     private var sendCrashReportsSetting: BoolSetting?
     private var sendDailyUsagePingSetting: BoolSetting?
@@ -183,87 +182,56 @@ class AppSettingsTableViewController: SettingsTableViewController,
     private func setupDataSettings() {
         guard let profile else { return }
 
-        let isTermsOfServiceFeatureEnabled = featureFlags.isFeatureEnabled(.tosFeature, checking: .buildOnly)
-
         let studiesSetting = StudiesToggleSetting(
             prefs: profile.prefs,
             delegate: settingsDelegate,
             theme: themeManager.getCurrentTheme(for: windowUUID),
             settingsDelegate: parentCoordinator,
-            title: isTermsOfServiceFeatureEnabled ? .StudiesSettingTitleV2 : .SettingsStudiesToggleTitle,
-            message: isTermsOfServiceFeatureEnabled ? .StudiesSettingMessageV2 : .SettingsStudiesToggleMessage,
-            linkedText: isTermsOfServiceFeatureEnabled ? .StudiesSettingLinkV2 : .SettingsStudiesToggleLink,
-            isToSEnabled: isTermsOfServiceFeatureEnabled
+            title: .StudiesSettingTitleV2,
+            message: .StudiesSettingMessageV2,
+            linkedText: .StudiesSettingLinkV2
         )
 
-        // Only add these toggles to the Settings if Terms Of Service feature flag is enabled
-        if isTermsOfServiceFeatureEnabled {
-            let sendTechnicalDataSettings = SendDataSetting(
-                prefs: profile.prefs,
-                delegate: settingsDelegate,
-                theme: themeManager.getCurrentTheme(for: windowUUID),
-                settingsDelegate: parentCoordinator,
-                title: .SendTechnicalDataSettingTitleV2,
-                message: String(format: .SendTechnicalDataSettingMessageV2, AppName.shortName.rawValue),
-                linkedText: .SendTechnicalDataSettingLinkV2,
-                prefKey: AppConstants.prefSendUsageData,
-                a11yId: AccessibilityIdentifiers.Settings.SendData.sendTechnicalDataTitle,
-                learnMoreURL: SupportUtils.URLForTopic("mobile-technical-and-interaction-data"),
-                isToSEnabled: isTermsOfServiceFeatureEnabled
-            )
-
-            sendTechnicalDataSettings.shouldSendData = { [weak self] value in
-                guard let self, let profile = self.profile else { return }
-                TermsOfServiceManager(prefs: profile.prefs).shouldSendTechnicalData(value: value)
-                studiesSetting.updateSetting(for: value)
-            }
-            sendTechnicalDataSetting = sendTechnicalDataSettings
+        let sendTechnicalDataSettings = SendDataSetting(
+            prefs: profile.prefs,
+            delegate: settingsDelegate,
+            theme: themeManager.getCurrentTheme(for: windowUUID),
+            settingsDelegate: parentCoordinator,
+            title: .SendTechnicalDataSettingTitleV2,
+            message: String(format: .SendTechnicalDataSettingMessageV2, AppName.shortName.rawValue),
+            linkedText: .SendTechnicalDataSettingLinkV2,
+            prefKey: AppConstants.prefSendUsageData,
+            a11yId: AccessibilityIdentifiers.Settings.SendData.sendTechnicalDataTitle,
+            learnMoreURL: SupportUtils.URLForTopic("mobile-technical-and-interaction-data")
+        )
 
-            let sendDailyUsagePingSettings = SendDataSetting(
-                prefs: profile.prefs,
-                delegate: settingsDelegate,
-                theme: themeManager.getCurrentTheme(for: windowUUID),
-                settingsDelegate: parentCoordinator,
-                title: .SendDailyUsagePingSettingTitle,
-                message: String(format: .SendDailyUsagePingSettingMessage, MozillaName.shortName.rawValue),
-                linkedText: .SendDailyUsagePingSettingLinkV2,
-                prefKey: AppConstants.prefSendDailyUsagePing,
-                a11yId: AccessibilityIdentifiers.Settings.SendData.sendDailyUsagePingTitle,
-                learnMoreURL: SupportUtils.URLForTopic("usage-ping-settings-mobile"),
-                isToSEnabled: isTermsOfServiceFeatureEnabled
-            )
-            sendDailyUsagePingSettings.shouldSendData = { [weak self] value in
-                if value {
-                    self?.gleanLifecycleObserver.startObserving()
-                } else {
-                    self?.gleanLifecycleObserver.stopObserving()
-                }
-            }
-            sendDailyUsagePingSetting = sendDailyUsagePingSettings
-        } else {
-            let sendAnonymousUsageDataSettings = SendDataSetting(
-                prefs: profile.prefs,
-                delegate: settingsDelegate,
-                theme: themeManager.getCurrentTheme(for: windowUUID),
-                settingsDelegate: parentCoordinator,
-                title: .SendUsageSettingTitle,
-                message: String(format: .SendUsageSettingMessage,
-                                MozillaName.shortName.rawValue,
-                                AppName.shortName.rawValue),
-                linkedText: .SendUsageSettingLink,
-                prefKey: AppConstants.prefSendUsageData,
-                a11yId: AccessibilityIdentifiers.Settings.SendData.sendAnonymousUsageDataTitle,
-                learnMoreURL: SupportUtils.URLForTopic("adjust"),
-                isToSEnabled: isTermsOfServiceFeatureEnabled
-            )
+        sendTechnicalDataSettings.shouldSendData = { [weak self] value in
+            guard let self, let profile = self.profile else { return }
+            TermsOfServiceManager(prefs: profile.prefs).shouldSendTechnicalData(value: value)
+            studiesSetting.updateSetting(for: value)
+        }
+        sendTechnicalDataSetting = sendTechnicalDataSettings
 
-            sendAnonymousUsageDataSettings.shouldSendData = { [weak self] value in
-                guard let self, let profile = self.profile else { return }
-                TermsOfServiceManager(prefs: profile.prefs).shouldSendTechnicalData(value: value)
-                studiesSetting.updateSetting(for: value)
+        let sendDailyUsagePingSettings = SendDataSetting(
+            prefs: profile.prefs,
+            delegate: settingsDelegate,
+            theme: themeManager.getCurrentTheme(for: windowUUID),
+            settingsDelegate: parentCoordinator,
+            title: .SendDailyUsagePingSettingTitle,
+            message: String(format: .SendDailyUsagePingSettingMessage, MozillaName.shortName.rawValue),
+            linkedText: .SendDailyUsagePingSettingLinkV2,
+            prefKey: AppConstants.prefSendDailyUsagePing,
+            a11yId: AccessibilityIdentifiers.Settings.SendData.sendDailyUsagePingTitle,
+            learnMoreURL: SupportUtils.URLForTopic("usage-ping-settings-mobile")
+        )
+        sendDailyUsagePingSettings.shouldSendData = { [weak self] value in
+            if value {
+                self?.gleanLifecycleObserver.startObserving()
+            } else {
+                self?.gleanLifecycleObserver.stopObserving()
             }
-            sendAnonymousUsageDataSetting = sendAnonymousUsageDataSettings
         }
+        sendDailyUsagePingSetting = sendDailyUsagePingSettings
 
         let sendCrashReportsSettings = SendDataSetting(
             prefs: profile.prefs,
@@ -272,11 +240,10 @@ class AppSettingsTableViewController: SettingsTableViewController,
             settingsDelegate: parentCoordinator,
             title: .SendCrashReportsSettingTitle,
             message: String(format: .SendCrashReportsSettingMessageV2, MozillaName.shortName.rawValue),
-            linkedText: isTermsOfServiceFeatureEnabled ? .SendCrashReportsSettingLinkV2 : .SendCrashReportsSettingLink,
+            linkedText: .SendCrashReportsSettingLinkV2,
             prefKey: AppConstants.prefSendCrashReports,
             a11yId: AccessibilityIdentifiers.Settings.SendData.sendCrashReportsTitle,
-            learnMoreURL: SupportUtils.URLForTopic("ios-crash-reports"),
-            isToSEnabled: isTermsOfServiceFeatureEnabled
+            learnMoreURL: SupportUtils.URLForTopic("ios-crash-reports")
         )
         self.sendCrashReportsSetting = sendCrashReportsSettings
 
@@ -452,8 +419,6 @@ class AppSettingsTableViewController: SettingsTableViewController,
     }
 
     private func getSupportSettings() -> [SettingSection] {
-        let isTermsOfServiceFeatureEnabled = featureFlags.isFeatureEnabled(.tosFeature, checking: .buildOnly)
-
         var supportSettings = [
             ShowIntroductionSetting(settings: self, settingsDelegate: self),
             SendFeedbackSetting(settingsDelegate: parentCoordinator),
@@ -471,25 +436,20 @@ class AppSettingsTableViewController: SettingsTableViewController,
             )
         }
 
-        guard let studiesToggleSetting, let sendCrashReportsSetting else { return [] }
-
-        if isTermsOfServiceFeatureEnabled {
-            guard let sendTechnicalDataSetting, let sendDailyUsagePingSetting else { return [] }
-            supportSettings.append(contentsOf: [
-                sendTechnicalDataSetting,
-                studiesToggleSetting,
-                sendDailyUsagePingSetting,
-                sendCrashReportsSetting
-            ])
-        } else {
-            guard let sendAnonymousUsageDataSetting else { return [] }
-            supportSettings.append(contentsOf: [
-                sendAnonymousUsageDataSetting,
-                sendCrashReportsSetting,
-                studiesToggleSetting
-            ])
+        guard let sendTechnicalDataSetting,
+              let sendDailyUsagePingSetting,
+              let studiesToggleSetting,
+              let sendCrashReportsSetting else {
+            return []
         }
 
+        supportSettings.append(contentsOf: [
+            sendTechnicalDataSetting,
+            studiesToggleSetting,
+            sendDailyUsagePingSetting,
+            sendCrashReportsSetting
+        ])
+
         supportSettings.append(contentsOf: [
             OpenSupportPageSetting(delegate: settingsDelegate,
                                    theme: themeManager.getCurrentTheme(for: windowUUID),

firefox-ios/Client/Frontend/Settings/Main/Support/SendDataSetting.swift

@@ -23,8 +23,7 @@ class SendDataSetting: BoolSetting {
          linkedText: String,
          prefKey: String,
          a11yId: String,
-         learnMoreURL: URL?,
-         isToSEnabled: Bool) {
+         learnMoreURL: URL?) {
         let statusText = NSMutableAttributedString()
         statusText.append(
             NSAttributedString(
@@ -34,7 +33,7 @@ class SendDataSetting: BoolSetting {
         )
         statusText.append(
             NSAttributedString(
-                string: isToSEnabled ? "\n" : " "
+                string: "\n"
             )
         )
         statusText.append(

firefox-ios/Client/Frontend/Settings/Main/Support/StudiesToggleSetting.swift

@@ -15,16 +15,15 @@ class StudiesToggleSetting: BoolSetting {
          settingsDelegate: SupportSettingsDelegate?,
          title: String,
          message: String,
-         linkedText: String,
-         isToSEnabled: Bool) {
+         linkedText: String) {
         let statusText = NSMutableAttributedString()
         statusText.append(
             NSAttributedString(
                 string: message,
                 attributes: [NSAttributedString.Key.foregroundColor: theme.colors.textSecondary]
             )
         )
-        statusText.append(NSAttributedString(string: isToSEnabled ? "\n" : " "))
+        statusText.append(NSAttributedString(string: "\n"))
         statusText.append(
             NSAttributedString(
                 string: linkedText,

firefox-ios/Shared/Strings.swift

@@ -5382,31 +5382,11 @@ extension String {
 
 // MARK: - Settings Home
 extension String {
-    public static let SendUsageSettingTitle = MZLocalizedString(
-        key: "Settings.SendUsage.Title",
-        tableName: nil,
-        value: "Send Usage Data",
-        comment: "The title for the setting to send usage data.")
-    public static let SendUsageSettingLink = MZLocalizedString(
-        key: "Settings.SendUsage.Link",
-        tableName: nil,
-        value: "Learn More.",
-        comment: "title for a link that explains how mozilla collects telemetry")
-    public static let SendUsageSettingMessage = MZLocalizedString(
-        key: "Settings.SendUsage.Message",
-        tableName: nil,
-        value: "Mozilla strives to only collect what we need to provide and improve Firefox for everyone.",
-        comment: "A short description that explains why mozilla collects usage data.")
     public static let SendCrashReportsSettingTitle = MZLocalizedString(
         key: "Settings.CrashReports.Title.v135",
         tableName: "Settings",
         value: "Automatically Send Crash Reports",
         comment: "On the Settings screen, this is the title text for a toggle which controls automatically sending crash reports.")
-    public static let SendCrashReportsSettingLink = MZLocalizedString(
-        key: "Settings.CrashReports.Link.v135",
-        tableName: "Settings",
-        value: "Learn More.",
-        comment: "Title for a link that explains how Mozilla send crash reports.")
     public static let SendCrashReportsSettingLinkV2 = MZLocalizedString(
         key: "Settings.CrashReports.Link.v136",
         tableName: "Settings",
@@ -5479,25 +5459,6 @@ extension String {
         comment: "The description of the open new tab siri shortcut")
 }
 
-// MARK: - Nimbus settings
-extension String {
-    public static let SettingsStudiesToggleTitle = MZLocalizedString(
-        key: "Settings.Studies.Toggle.Title",
-        tableName: nil,
-        value: "Studies",
-        comment: "Label used as a toggle item in Settings. When this is off, the user is opting out of all studies.")
-    public static let SettingsStudiesToggleLink = MZLocalizedString(
-        key: "Settings.Studies.Toggle.Link",
-        tableName: nil,
-        value: "Learn More.",
-        comment: "Title for a link that explains what Mozilla means by Studies")
-    public static let SettingsStudiesToggleMessage = MZLocalizedString(
-        key: "Settings.Studies.Toggle.Message",
-        tableName: nil,
-        value: "Firefox may install and run studies from time to time.",
-        comment: "A short description that explains that Mozilla is running studies")
-}
-
 // MARK: - Share extension
 extension String {
     public static let SendToCancelButton = MZLocalizedString(
@@ -7699,6 +7660,41 @@ extension String {
                 tableName: "Onboarding",
                 value: "Agree and continue",
                 comment: "Title for the confirmation button for Terms of Service agreement, in the Terms of Service screen.")
+            public static let SendUsageSettingTitle = MZLocalizedString(
+                key: "Settings.SendUsage.Title",
+                tableName: nil,
+                value: "Send Usage Data",
+                comment: "The title for the setting to send usage data.")
+            public static let SendUsageSettingLink = MZLocalizedString(
+                key: "Settings.SendUsage.Link",
+                tableName: nil,
+                value: "Learn More.",
+                comment: "title for a link that explains how mozilla collects telemetry")
+            public static let SendUsageSettingMessage = MZLocalizedString(
+                key: "Settings.SendUsage.Message",
+                tableName: nil,
+                value: "Mozilla strives to only collect what we need to provide and improve Firefox for everyone.",
+                comment: "A short description that explains why mozilla collects usage data.")
+            public static let SettingsStudiesToggleTitle = MZLocalizedString(
+                key: "Settings.Studies.Toggle.Title",
+                tableName: nil,
+                value: "Studies",
+                comment: "Label used as a toggle item in Settings. When this is off, the user is opting out of all studies.")
+            public static let SettingsStudiesToggleLink = MZLocalizedString(
+                key: "Settings.Studies.Toggle.Link",
+                tableName: nil,
+                value: "Learn More.",
+                comment: "Title for a link that explains what Mozilla means by Studies")
+            public static let SettingsStudiesToggleMessage = MZLocalizedString(
+                key: "Settings.Studies.Toggle.Message",
+                tableName: nil,
+                value: "Firefox may install and run studies from time to time.",
+                comment: "A short description that explains that Mozilla is running studies")
+            public static let SendCrashReportsSettingLink = MZLocalizedString(
+                key: "Settings.CrashReports.Link.v135",
+                tableName: "Settings",
+                value: "Learn More.",
+                comment: "Title for a link that explains how Mozilla send crash reports.")
         }
     }
 }

firefox-ios/firefox-ios-tests/Tests/XCUITests/SettingsTests.swift

@@ -155,7 +155,9 @@ class SettingsTests: BaseTestCase {
             table.cells[settingsQuery.ClearData.title], app.switches[settingsQuery.ClosePrivateTabs.title],
             table.cells[settingsQuery.ContentBlocker.title], table.cells[settingsQuery.Notifications.title],
             table.cells[settingsQuery.ShowIntroduction.title],
-            table.cells[settingsQuery.SendData.sendAnonymousUsageDataTitle],
+            table.cells[settingsQuery.SendData.sendTechnicalDataTitle],
+            table.cells[settingsQuery.SendData.sendDailyUsagePingTitle],
+            table.cells[settingsQuery.SendData.sendCrashReportsTitle],
             table.cells[settingsQuery.StudiesToggle.title], table.cells[settingsQuery.Version.title],
             table.cells[settingsQuery.PrivacyPolicy.title], table.cells[settingsQuery.SendFeedback.title],
             table.cells[settingsQuery.Help.title], table.cells[settingsQuery.RateOnAppStore.title],