Fix voice search settings

https://app.asana.com/0/414709148257752/1206454436350674/f
duckduckgo · Jan 26, 2024 · ef28848 · ef28848
1 parent 56da839
commit ef28848
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/DuckDuckGo/SettingsCustomizeView.swift b/DuckDuckGo/SettingsCustomizeView.swift
@@ -37,7 +37,7 @@ struct SettingsCustomizeView: View {
             SettingsCellView(label: UserText.settingsAutocomplete,
                              accesory: .toggle(isOn: viewModel.autocompleteBinding))
 
-            if viewModel.state.speechRecognitionEnabled {
+            if viewModel.state.speechRecognitionAvailable {
                 SettingsCellView(label: UserText.settingsVoiceSearch,
                                  accesory: .toggle(isOn: viewModel.voiceSearchEnabledBinding))
             }

diff --git a/DuckDuckGo/SettingsState.swift b/DuckDuckGo/SettingsState.swift
@@ -78,7 +78,7 @@ struct SettingsState {
     // Features
     var debugModeEnabled: Bool
     var voiceSearchEnabled: Bool
-    var speechRecognitionEnabled: Bool
+    var speechRecognitionAvailable: Bool // Returns if the device has speech recognition available
     var loginsEnabled: Bool
 
     // Network Protection properties
@@ -108,7 +108,7 @@ struct SettingsState {
             version: "0.0.0.0",
             debugModeEnabled: false,
             voiceSearchEnabled: false,
-            speechRecognitionEnabled: false,
+            speechRecognitionAvailable: false,
             loginsEnabled: false,
             networkProtection: NetworkProtection(enabled: false, status: ""),
             subscription: Subscription(enabled: false, canPurchase: false,

diff --git a/DuckDuckGo/SettingsViewModel.swift b/DuckDuckGo/SettingsViewModel.swift
@@ -43,6 +43,7 @@ final class SettingsViewModel: ObservableObject {
     private var legacyViewProvider: SettingsLegacyViewProvider
     private lazy var versionProvider: AppVersion = AppVersion.shared
     private var accountManager: AccountManager
+    private let voiceSearchHelper: VoiceSearchHelperProtocol
 
 #if NETWORK_PROTECTION
     private let connectionObserver = ConnectionStatusObserverThroughSession()
@@ -160,15 +161,15 @@ final class SettingsViewModel: ObservableObject {
                     self.enableVoiceSearch { [weak self] result in
                         DispatchQueue.main.async {
                             self?.state.voiceSearchEnabled = result
-                            self?.appSettings.voiceSearchEnabled = result
+                            self?.voiceSearchHelper.enableVoiceSearch(true)
                             if !result {
                                 // Permission is denied
                                 self?.shouldShowNoMicrophonePermissionAlert = true
                             }
                         }
                     }
                 } else {
-                    self.appSettings.voiceSearchEnabled = false
+                    self.voiceSearchHelper.enableVoiceSearch(false)
                     self.state.voiceSearchEnabled = false
                 }
             }
@@ -198,11 +199,13 @@ final class SettingsViewModel: ObservableObject {
     init(state: SettingsState? = nil,
          legacyViewProvider: SettingsLegacyViewProvider,
          accountManager: AccountManager,
-         navigateOnAppearDestination: SettingsSection = .none) {
+         navigateOnAppearDestination: SettingsSection = .none,
+         voiceSearchHelper: VoiceSearchHelperProtocol = AppDependencyProvider.shared.voiceSearchHelper) {
         self.state = SettingsState.defaults
         self.legacyViewProvider = legacyViewProvider
         self.accountManager = accountManager
         self.onAppearNavigationTarget = navigateOnAppearDestination
+        self.voiceSearchHelper = voiceSearchHelper
     }
 }
 
@@ -229,8 +232,8 @@ extension SettingsViewModel {
             activeWebsiteAccount: nil,
             version: versionProvider.versionAndBuildNumber,
             debugModeEnabled: featureFlagger.isFeatureOn(.debugMenu) || isDebugBuild,
-            voiceSearchEnabled: AppDependencyProvider.shared.voiceSearchHelper.isSpeechRecognizerAvailable,
-            speechRecognitionEnabled: AppDependencyProvider.shared.voiceSearchHelper.isSpeechRecognizerAvailable,
+            voiceSearchEnabled: AppDependencyProvider.shared.voiceSearchHelper.isVoiceSearchEnabled,
+            speechRecognitionAvailable: AppDependencyProvider.shared.voiceSearchHelper.isSpeechRecognizerAvailable,
             loginsEnabled: featureFlagger.isFeatureOn(.autofillAccessCredentialManagement),
             networkProtection: getNetworkProtectionState(),
             subscription: getSubscriptionState(),
@@ -299,7 +302,6 @@ extension SettingsViewModel {
                 completion(false)
                 return
             }
-            AppDependencyProvider.shared.voiceSearchHelper.enableVoiceSearch(true)
             completion(true)
         }
     }