refactor(ios): drop legacy talk payload and keychain fallbacks

This commit is contained in:
Peter Steinberger
2026-02-24 22:38:47 +00:00
parent 853f75592f
commit f4e6f87303
4 changed files with 25 additions and 80 deletions

View File

@@ -26,7 +26,6 @@ enum GatewaySettingsStore {
private static let preferredGatewayStableIDAccount = "preferredStableID"
private static let lastDiscoveredGatewayStableIDAccount = "lastDiscoveredStableID"
private static let talkProviderApiKeyAccountPrefix = "provider.apiKey."
private static let talkElevenLabsApiKeyLegacyAccount = "elevenlabs.apiKey"
static func bootstrapPersistence() {
self.ensureStableInstanceID()
@@ -154,18 +153,6 @@ enum GatewaySettingsStore {
account: account)?
.trimmingCharacters(in: .whitespacesAndNewlines)
if value?.isEmpty == false { return value }
if providerId == "elevenlabs" {
let legacyValue = KeychainStore.loadString(
service: self.talkService,
account: self.talkElevenLabsApiKeyLegacyAccount)?
.trimmingCharacters(in: .whitespacesAndNewlines)
if legacyValue?.isEmpty == false {
_ = KeychainStore.saveString(legacyValue!, service: self.talkService, account: account)
return legacyValue
}
}
return nil
}
@@ -175,23 +162,9 @@ enum GatewaySettingsStore {
let trimmed = apiKey?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
if trimmed.isEmpty {
_ = KeychainStore.delete(service: self.talkService, account: account)
if providerId == "elevenlabs" {
_ = KeychainStore.delete(service: self.talkService, account: self.talkElevenLabsApiKeyLegacyAccount)
}
return
}
_ = KeychainStore.saveString(trimmed, service: self.talkService, account: account)
if providerId == "elevenlabs" {
_ = KeychainStore.delete(service: self.talkService, account: self.talkElevenLabsApiKeyLegacyAccount)
}
}
static func loadTalkElevenLabsApiKey() -> String? {
self.loadTalkProviderApiKey(provider: "elevenlabs")
}
static func saveTalkElevenLabsApiKey(_ apiKey: String?) {
self.saveTalkProviderApiKey(apiKey, provider: "elevenlabs")
}
static func saveLastGatewayConnectionManual(host: String, port: Int, useTLS: Bool, stableID: String) {

View File

@@ -1889,7 +1889,6 @@ extension TalkModeManager {
struct TalkProviderConfigSelection {
let provider: String
let config: [String: Any]
let normalizedPayload: Bool
}
private static func normalizedTalkProviderID(_ raw: String?) -> String? {
@@ -1901,29 +1900,22 @@ extension TalkModeManager {
guard let talk else { return nil }
let rawProvider = talk["provider"] as? String
let rawProviders = talk["providers"] as? [String: Any]
let hasNormalized = rawProvider != nil || rawProviders != nil
if hasNormalized {
let providers = rawProviders ?? [:]
let normalizedProviders = providers.reduce(into: [String: [String: Any]]()) { acc, entry in
guard
let providerID = Self.normalizedTalkProviderID(entry.key),
let config = entry.value as? [String: Any]
else { return }
acc[providerID] = config
}
let providerID =
Self.normalizedTalkProviderID(rawProvider) ??
normalizedProviders.keys.sorted().first ??
Self.defaultTalkProvider
return TalkProviderConfigSelection(
provider: providerID,
config: normalizedProviders[providerID] ?? [:],
normalizedPayload: true)
guard rawProvider != nil || rawProviders != nil else { return nil }
let providers = rawProviders ?? [:]
let normalizedProviders = providers.reduce(into: [String: [String: Any]]()) { acc, entry in
guard
let providerID = Self.normalizedTalkProviderID(entry.key),
let config = entry.value as? [String: Any]
else { return }
acc[providerID] = config
}
let providerID =
Self.normalizedTalkProviderID(rawProvider) ??
normalizedProviders.keys.sorted().first ??
Self.defaultTalkProvider
return TalkProviderConfigSelection(
provider: Self.defaultTalkProvider,
config: talk,
normalizedPayload: false)
provider: providerID,
config: normalizedProviders[providerID] ?? [:])
}
func reloadConfig() async {
@@ -1934,6 +1926,10 @@ extension TalkModeManager {
guard let config = json["config"] as? [String: Any] else { return }
let talk = config["talk"] as? [String: Any]
let selection = Self.selectTalkProviderConfig(talk)
if talk != nil, selection == nil {
GatewayDiagnostics.log(
"talk config ignored: legacy payload unsupported on iOS beta; expected talk.provider/providers")
}
let activeProvider = selection?.provider ?? Self.defaultTalkProvider
let activeConfig = selection?.config
self.defaultVoiceId = (activeConfig?["voiceId"] as? String)?
@@ -1983,7 +1979,7 @@ extension TalkModeManager {
if let interrupt = talk?["interruptOnSpeech"] as? Bool {
self.interruptOnSpeech = interrupt
}
if selection?.normalizedPayload == true {
if selection != nil {
GatewayDiagnostics.log("talk config provider=\(activeProvider)")
}
} catch {