AI feedback

Author: dkaukov

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/data/AppSetting.java

@@ -46,6 +46,9 @@ public class AppSetting {
     public static final String SETTING_APRS_TX_ENCODER = "aprsTxEncoder";
     public static final String SETTING_AX25_ENCODER = "ax25Encoder";
     public static final String SETTING_AX25_DECODER = "ax25Decoder";
+    public static final String VALUE_AX25_SOFTWARE = "Software";
+    public static final String VALUE_AX25_FIRMWARE = "Firmware";
+    public static final String VALUE_AX25_BOTH = "Both";
     public static final String SETTING_CALLSIGN = "callsign";
     public static final String SETTING_STICKY_PTT = "stickyPTT";
 

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/radio/RadioAudioService.java

@@ -79,6 +79,7 @@ kv4p HT (see http://kv4p.com)
 import com.vagell.kv4pht.aprs.parser.Parser;
 import com.vagell.kv4pht.aprs.parser.Position;
 import com.vagell.kv4pht.aprs.parser.PositionField;
+import com.vagell.kv4pht.data.AppSetting;
 import com.vagell.kv4pht.data.ChannelMemory;
 import com.vagell.kv4pht.javAX25.ax25.Afsk1200Modulator;
 import com.vagell.kv4pht.javAX25.ax25.Afsk1200MultiDemodulator;
@@ -272,7 +273,7 @@ public enum AprsTxEncoder {
         FIRMWARE;
 
         public static AprsTxEncoder fromSetting(String value) {
-            if ("Firmware".equalsIgnoreCase(value)) {
+            if (AppSetting.VALUE_AX25_FIRMWARE.equalsIgnoreCase(value)) {
                 return FIRMWARE;
             }
             return SOFTWARE;
@@ -285,10 +286,10 @@ public enum Ax25Decoder {
         FIRMWARE;
 
         public static Ax25Decoder fromSetting(String value) {
-            if ("Software".equalsIgnoreCase(value)) {
+            if (AppSetting.VALUE_AX25_SOFTWARE.equalsIgnoreCase(value)) {
                 return SOFTWARE;
             }
-            if ("Firmware".equalsIgnoreCase(value)) {
+            if (AppSetting.VALUE_AX25_FIRMWARE.equalsIgnoreCase(value)) {
                 return FIRMWARE;
             }
             return BOTH;

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/MainActivity.java

@@ -1123,7 +1123,7 @@ private void applyAprsSettings(Map<String, String> settings) {
         String accuracy = settings.get(AppSetting.SETTING_APRS_POSITION_ACCURACY);
         String beacon = settings.get(AppSetting.SETTING_APRS_BEACON_POSITION);
         String txEncoder = getAx25EncoderSetting(settings);
-        String decoder = settings.getOrDefault(AppSetting.SETTING_AX25_DECODER, "Both");
+        String decoder = settings.getOrDefault(AppSetting.SETTING_AX25_DECODER, AppSetting.VALUE_AX25_BOTH);
 
         if (accuracy != null && radioAudioService != null) {
             threadPoolExecutor.execute(() -> radioAudioService.setAprsPositionAccuracy(
@@ -1155,7 +1155,7 @@ private String getAx25EncoderSetting(Map<String, String> settings) {
         if (stored != null) {
             return stored;
         }
-        return settings.getOrDefault(AppSetting.SETTING_APRS_TX_ENCODER, "Software");
+        return settings.getOrDefault(AppSetting.SETTING_APRS_TX_ENCODER, AppSetting.VALUE_AX25_SOFTWARE);
     }
 
     @SuppressLint("ClickableViewAccessibility")

android-src/KV4PHT/app/src/main/java/com/vagell/kv4pht/ui/SettingsActivity.java

@@ -104,8 +104,13 @@ private void populateMicGainOptions() {
 
     private void populateAprsOptions() {
         setDropdownOptions(R.id.aprsPositionAccuracyTextView, List.of("Exact", "Approx"));
-        setDropdownOptions(R.id.ax25DecoderTextView, List.of("Both", "Software", "Firmware"));
-        setDropdownOptions(R.id.ax25EncoderTextView, List.of("Software", "Firmware"));
+        setDropdownOptions(R.id.ax25DecoderTextView, List.of(
+            AppSetting.VALUE_AX25_BOTH,
+            AppSetting.VALUE_AX25_SOFTWARE,
+            AppSetting.VALUE_AX25_FIRMWARE));
+        setDropdownOptions(R.id.ax25EncoderTextView, List.of(
+            AppSetting.VALUE_AX25_SOFTWARE,
+            AppSetting.VALUE_AX25_FIRMWARE));
     }
 
     private void populateRadioOptions() {
@@ -171,7 +176,7 @@ private void setDropdownWithDefault(Map<String, String> settings, String key, in
     }
 
     private void setAx25DecoderDropdown(Map<String, String> settings) {
-        setDropdownWithDefault(settings, AppSetting.SETTING_AX25_DECODER, R.id.ax25DecoderTextView, "Both");
+        setDropdownWithDefault(settings, AppSetting.SETTING_AX25_DECODER, R.id.ax25DecoderTextView, AppSetting.VALUE_AX25_BOTH);
     }
 
     private void setAx25EncoderDropdown(Map<String, String> settings) {
@@ -181,14 +186,16 @@ private void setAx25EncoderDropdown(Map<String, String> settings) {
             saveAppSettingAsync(AppSetting.SETTING_AX25_ENCODER, stored);
         }
         this.<AutoCompleteTextView>findViewById(R.id.ax25EncoderTextView)
-            .setText(stored == null ? "Software" : stored, false);
+            .setText(stored == null ? AppSetting.VALUE_AX25_SOFTWARE : stored, false);
     }
 
     private String mapLegacyEncoderSetting(String stored) {
-        if ("ESP32".equalsIgnoreCase(stored) || "Firmware".equalsIgnoreCase(stored) || "1".equals(stored)) {
-            return "Firmware";
+        if ("ESP32".equalsIgnoreCase(stored)
+            || AppSetting.VALUE_AX25_FIRMWARE.equalsIgnoreCase(stored)
+            || "1".equals(stored)) {
+            return AppSetting.VALUE_AX25_FIRMWARE;
         }
-        return "Software";
+        return AppSetting.VALUE_AX25_SOFTWARE;
     }
 
     private void populateOriginalValues(Runnable callback) {