diff --git a/app/g2/dashboard-controller.ts b/app/g2/dashboard-controller.ts index 29360f3c..77fff3a7 100644 --- a/app/g2/dashboard-controller.ts +++ b/app/g2/dashboard-controller.ts @@ -33,6 +33,7 @@ import { nightscoutSiteUrlSetting, onAnySettingChanged, rawScreenshotsEnabledSetting, + saveVoiceRecordingsSetting, systemCardNameSetting, voiceProviderSetting, type ConfigSettingString, @@ -280,8 +281,15 @@ class DashboardController { setActiveTextSettingValue(value: string): void { noteDashboardPhoneTextInput(); - if (!this.activeTextSetting) return; - this.updateTextSetting(this.activeTextSetting, value); + const setting = this.activeTextSetting; + if (!setting) return; + if (setting.get() === value) return; + setting.set(value); + // Deliberately do NOT emit() here. The phone TextField is the source of + // truth while typing; echoing activeTextSettingValue back into its two-way + // binding on every keystroke drops fast/pasted characters (observed: a + // 51-char API key stored as its first 46 chars). Just refresh the preview. + this.previewOrRenderAfterTextSettingChange(setting.label); } async connect(): Promise { @@ -574,6 +582,7 @@ class DashboardController { communicator: communicator.getNativeCommunicator(), provider: voiceProviderSetting.get(), elevenLabsApiKey: elevenLabsApiKeySetting.get(), + saveRecording: saveVoiceRecordingsSetting.get(), }); }) .catch((error) => { diff --git a/app/native/elevenlabs-stt.ts b/app/native/elevenlabs-stt.ts index 28eebf6f..ab331083 100644 --- a/app/native/elevenlabs-stt.ts +++ b/app/native/elevenlabs-stt.ts @@ -61,7 +61,9 @@ export class ElevenLabsSttClient { }); try { // The API key rides an xi-api-key header, added by FaceclawWebSocket. - this.ws = new com.faceclaw.app.FaceclawWebSocket(url, this.listenerProxy, "xi-api-key", this.options.apiKey); + const key = this.options.apiKey; + console.log(`[elevenlabs] connecting; apiKey length=${key.length} prefix=${key.slice(0, 4)}`); + this.ws = new com.faceclaw.app.FaceclawWebSocket(url, this.listenerProxy, "xi-api-key", key); this.options.onStatus("Connecting to ElevenLabs..."); } catch (error) { this.options.onError(`ElevenLabs connection failed: ${String((error as Error)?.message ?? error)}`); diff --git a/app/native/g2mirror-client.ts b/app/native/g2mirror-client.ts index 28cb0608..80b3b4ff 100644 --- a/app/native/g2mirror-client.ts +++ b/app/native/g2mirror-client.ts @@ -122,7 +122,7 @@ export class G2MirrorClient { }, }); try { - this.ws = new com.faceclaw.app.FaceclawWebSocket(url, this.listenerProxy); + this.ws = new com.faceclaw.app.FaceclawWebSocket(url, this.listenerProxy, null, null); } catch (error) { this.ws = null; this.handleConnectionLost(`Connection failed: ${shortenError(String((error as Error)?.message ?? error))}`); diff --git a/app/native/voice-control.ts b/app/native/voice-control.ts index 9e4b98f5..e7b7d09e 100644 --- a/app/native/voice-control.ts +++ b/app/native/voice-control.ts @@ -24,6 +24,7 @@ export type PushToTalkOptions = { communicator: any; provider: VoiceProviderKind; elevenLabsApiKey: string; + saveRecording: boolean; }; export class FaceclawVoiceControlBridge { @@ -59,6 +60,7 @@ export class FaceclawVoiceControlBridge { if (this.started) this.stop(); this.ensureController(); this.controller?.setCommunicator(options.communicator); + this.controller?.setSaveRecordings(options.saveRecording); if (options.provider === "elevenlabs" && options.elevenLabsApiKey.trim()) { this.cloudClient = new ElevenLabsSttClient({ diff --git a/app/phone-ui/main-page.xml b/app/phone-ui/main-page.xml index f27e26f0..cdd28602 100644 --- a/app/phone-ui/main-page.xml +++ b/app/phone-ui/main-page.xml @@ -85,7 +85,7 @@ textChange="{{ onTextSettingTextChange }}" returnPress="{{ onTextSettingReturnPress }}" autocorrect="false" - autocapitalizationType="words" + autocapitalizationType="none" returnKeyType="done" /> diff --git a/app/phone-ui/main-view-model.ts b/app/phone-ui/main-view-model.ts index 8c44d3db..9d77aeac 100644 --- a/app/phone-ui/main-view-model.ts +++ b/app/phone-ui/main-view-model.ts @@ -344,7 +344,13 @@ export class MainViewModel extends Observable { dashboardController.setActiveTextSettingValue(args.object?.text ?? args.value ?? ""); } - onTextSettingReturnPress(): void { + onTextSettingReturnPress(args: { object?: { text?: string } }): void { + // Commit the field's actual text at done-time, in case the final + // keystroke's textChange hadn't landed yet. + const text = args?.object?.text; + if (typeof text === "string") { + dashboardController.setActiveTextSettingValue(text); + } dashboardController.finishActiveTextSettingEdit(); } diff --git a/app/ui/dashboard-settings.ts b/app/ui/dashboard-settings.ts index 0f9c3c56..b28b1d97 100644 --- a/app/ui/dashboard-settings.ts +++ b/app/ui/dashboard-settings.ts @@ -278,6 +278,13 @@ export const voiceProviderSetting = new ConfigSettingEnum({ formatValue: (value) => (value === "elevenlabs" ? "ElevenLabs" : "On-device"), }); +export const saveVoiceRecordingsSetting = new ConfigSettingBoolean({ + id: "save-voice-recordings", + label: "Save voice recordings", + storageKey: "developer.saveVoiceRecordings", + defaultValue: false, +}); + export const elevenLabsApiKeySetting = new ConfigSettingString({ id: "elevenlabs-api-key", label: "ElevenLabs key", diff --git a/app/ui/dashboard/settings-menus.ts b/app/ui/dashboard/settings-menus.ts index d97def58..0b9dcea3 100644 --- a/app/ui/dashboard/settings-menus.ts +++ b/app/ui/dashboard/settings-menus.ts @@ -1,5 +1,5 @@ import { dashboardState, TOP_LEFT_MENU_LAYOUT } from "../dashboard"; -import { batteryDisplayModeSetting, dashboardSlotIds, elevenLabsApiKeySetting, enumSettingMenuItem, rawScreenshotsEnabledSetting, showSignalStrengthSetting, showAndroidNotificationsSetting, showBatteryIndicatorsSetting, showFaceclawLogoSetting, systemCardNameSetting, textSettingMenuItem, toggleSettingMenuItem, voiceProviderSetting, dashboardSlotSettings, nightscoutSiteUrlSetting, nightscoutApiTokenSetting, screenTimeoutSetting } from "../dashboard-settings"; +import { batteryDisplayModeSetting, dashboardSlotIds, elevenLabsApiKeySetting, enumSettingMenuItem, rawScreenshotsEnabledSetting, saveVoiceRecordingsSetting, showSignalStrengthSetting, showAndroidNotificationsSetting, showBatteryIndicatorsSetting, showFaceclawLogoSetting, systemCardNameSetting, textSettingMenuItem, toggleSettingMenuItem, voiceProviderSetting, dashboardSlotSettings, nightscoutSiteUrlSetting, nightscoutApiTokenSetting, screenTimeoutSetting } from "../dashboard-settings"; import { MenuLayer } from "../menu"; export function createSettingsMenuLayer(): MenuLayer { @@ -46,6 +46,7 @@ function createDeveloperSettingsMenuLayer(): MenuLayer { "Settings > Developer", [ toggleSettingMenuItem(rawScreenshotsEnabledSetting), + toggleSettingMenuItem(saveVoiceRecordingsSetting), ], TOP_LEFT_MENU_LAYOUT, );