From b0c3796ddf4e1e2a69bfb8e0fe3b276adad56201 Mon Sep 17 00:00:00 2001 From: Georg Lukas Date: Fri, 3 Apr 2015 18:54:43 +0200 Subject: [PATCH] AFSK BT only allowed with HQ demod, fix #103 --- res/xml/backend_afsk.xml | 4 ++-- src/PrefsWrapper.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/res/xml/backend_afsk.xml b/res/xml/backend_afsk.xml index 018d53e..17b332a 100644 --- a/res/xml/backend_afsk.xml +++ b/res/xml/backend_afsk.xml @@ -9,14 +9,14 @@ android:key="afsk.hqdemod" android:title="@string/p_afsk_hqdemod" android:summary="@string/p_afsk_hqdemod_summary" - android:defaultValue="false" + android:defaultValue="true" /> diff --git a/src/PrefsWrapper.scala b/src/PrefsWrapper.scala index 57d9fd4..40a8ecf 100644 --- a/src/PrefsWrapper.scala +++ b/src/PrefsWrapper.scala @@ -65,6 +65,6 @@ class PrefsWrapper(val context : Context) { getPasscode(), getVersion()) def getAfskHQ() = getBoolean("afsk.hqdemod", true) - def getAfskBluetooth() = getBoolean("afsk.btsco", false) + def getAfskBluetooth() = getBoolean("afsk.btsco", false) && getAfskHQ() def getAfskOutput() = if (getAfskBluetooth()) AudioManager.STREAM_VOICE_CALL else getStringInt("afsk.output", 0) }