diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsWrapper.java b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsWrapper.java index 4156e95..1f66286 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsWrapper.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsWrapper.java @@ -36,7 +36,8 @@ public class SettingsWrapper { } public static boolean isFreeDvSoundModemModulation(SharedPreferences sharedPreferences) { - return sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_TYPE, "1200").startsWith("F"); + return isSoundModemEnabled(sharedPreferences) && + sharedPreferences.getString(PreferenceKeys.PORTS_SOUND_MODEM_TYPE, "1200").startsWith("F"); } public static int getFreeDvSoundModemModulation(SharedPreferences sharedPreferences) { diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/tools/AudioTools.java b/codec2talkie/src/main/java/com/radio/codec2talkie/tools/AudioTools.java index 697259c..3c16554 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/tools/AudioTools.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/tools/AudioTools.java @@ -49,9 +49,7 @@ public class AudioTools { } public static String getFreedvModeAsText(SharedPreferences sharedPreferences) { - if (SettingsWrapper.isSoundModemEnabled(sharedPreferences) && - SettingsWrapper.isFreeDvSoundModemModulation(sharedPreferences)) { - + if (SettingsWrapper.isFreeDvSoundModemModulation(sharedPreferences)) { switch (SettingsWrapper.getFreeDvSoundModemModulation(sharedPreferences)) { case Codec2.FREEDV_MODE_700C: return "700C";