Store model and voice per API provider

Use provider-specific SharedPreferences keys (e.g. model_GOOGLE_GEMINI,
voice_OPENAI_DIRECT) so each provider remembers its own model/voice
selection across provider switches. Falls back to the legacy global
key for backwards compatibility, then to the provider default.

Made-with: Cursor

Author: studerus

app/src/main/java/ch/fhnw/pepper_realtime/manager/SettingsRepository.kt

@@ -36,13 +36,15 @@ class SettingsRepository @Inject constructor(
         get() {
             val defaultModel = when (apiProviderEnum) {
                 RealtimeApiProvider.XAI -> "Grok Voice Agent"
-                // Google Live API requires models/ prefix for BidiGenerateContent
                 RealtimeApiProvider.GOOGLE_GEMINI -> "models/gemini-3.1-flash-live-preview"
                 else -> context.getString(R.string.openai_default_model)
             }
-            return settings.getString(KEY_MODEL, defaultModel) ?: defaultModel
+            val key = "${KEY_MODEL}_${apiProvider}"
+            return settings.getString(key, null)
+                ?: settings.getString(KEY_MODEL, defaultModel)
+                ?: defaultModel
         }
-        set(value) = settings.edit().putString(KEY_MODEL, value).apply()
+        set(value) = settings.edit().putString("${KEY_MODEL}_${apiProvider}", value).apply()
 
     var voice: String
         get() {
@@ -51,9 +53,12 @@ class SettingsRepository @Inject constructor(
                 RealtimeApiProvider.GOOGLE_GEMINI -> "Puck"
                 else -> "ash"
             }
-            return settings.getString(KEY_VOICE, defaultVoice) ?: defaultVoice
+            val key = "${KEY_VOICE}_${apiProvider}"
+            return settings.getString(key, null)
+                ?: settings.getString(KEY_VOICE, defaultVoice)
+                ?: defaultVoice
         }
-        set(value) = settings.edit().putString(KEY_VOICE, value).apply()
+        set(value) = settings.edit().putString("${KEY_VOICE}_${apiProvider}", value).apply()
 
     val speed: Float
         get() {
@@ -245,14 +250,6 @@ class SettingsRepository @Inject constructor(
         get() = settings.getBoolean(KEY_XAI_X_SEARCH, true)  // Default true for backwards compatibility
         set(value) = settings.edit().putBoolean(KEY_XAI_X_SEARCH, value).apply()
 
-    /**
-     * Remove persisted model and voice so the getters return the
-     * provider-specific defaults. Call after changing [apiProvider].
-     */
-    fun clearModelAndVoice() {
-        settings.edit().remove(KEY_MODEL).remove(KEY_VOICE).apply()
-    }
-
     /**
      * Clear all saved settings so every property falls back to its default value.
      * API keys are stored separately and are NOT affected.

app/src/main/java/ch/fhnw/pepper_realtime/ui/settings/SettingsViewModel.kt

@@ -143,7 +143,6 @@ class SettingsViewModel @Inject constructor(
     fun setApiProvider(provider: String) {
         if (provider != settingsRepository.apiProvider) {
             settingsRepository.apiProvider = provider
-            settingsRepository.clearModelAndVoice()
             val newModel = settingsRepository.model
             val newVoice = settingsRepository.voice
             _settingsState.update { it.copy(apiProvider = provider, model = newModel, voice = newVoice) }