From 7a685a5690ca4f519963d16861fdbd1d0db339db Mon Sep 17 00:00:00 2001 From: sh123 Date: Thu, 11 Aug 2022 16:46:31 +0300 Subject: [PATCH] No aprs when in freedv --- .../src/main/java/com/radio/codec2talkie/MainActivity.java | 4 ++-- .../java/com/radio/codec2talkie/settings/SettingsWrapper.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java b/codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java index f75f2a4..9a96de3 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/MainActivity.java @@ -474,7 +474,7 @@ public class MainActivity extends AppCompatActivity implements ServiceConnection } // aprs - boolean aprsEnabled = _sharedPreferences.getBoolean(PreferenceKeys.APRS_ENABLED, false); + boolean aprsEnabled = SettingsWrapper.isAprsEnabled(_sharedPreferences); if (aprsEnabled) { status += getString(R.string.aprs_label); @@ -526,7 +526,7 @@ public class MainActivity extends AppCompatActivity implements ServiceConnection @Override public boolean onPrepareOptionsMenu(Menu menu) { - boolean isAprsEnabled = _sharedPreferences.getBoolean(PreferenceKeys.APRS_ENABLED, false); + boolean isAprsEnabled = SettingsWrapper.isAprsEnabled(_sharedPreferences); menu.setGroupVisible(R.id.group_aprs, isAprsEnabled); return true; } 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 9165516..4156e95 100644 --- a/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsWrapper.java +++ b/codec2talkie/src/main/java/com/radio/codec2talkie/settings/SettingsWrapper.java @@ -76,6 +76,7 @@ public class SettingsWrapper { } public static boolean isAprsEnabled(SharedPreferences sharedPreferences) { - return sharedPreferences.getBoolean(PreferenceKeys.APRS_ENABLED, false); + return sharedPreferences.getBoolean(PreferenceKeys.APRS_ENABLED, false) && + !isFreeDvSoundModemModulation(sharedPreferences); // no aprs when in freedv } }