Allow disabling ABRP uploads independently

app/src/main/java/com/evsuite/abrp/UploadSettings.java

@@ -15,6 +15,7 @@ final class UploadSettings {
     static final String KEY_BOOST_LOW_SOC   = "boost_low_soc";
     static final String KEY_LOW_SOC_PERCENT = "low_soc_percent";
     static final String KEY_AUTOSTART       = "autostart";
+    static final String KEY_ABRP_UPLOAD_ENABLED = "abrp_upload_enabled";
 
     /**
      * On by default: an ABRP plan is only useful if it is fed from the moment the drive
@@ -22,6 +23,7 @@ final class UploadSettings {
      * service that starts itself must also be switchable off.
      */
     static final boolean DEFAULT_AUTOSTART = true;
+    static final boolean DEFAULT_ABRP_UPLOAD_ENABLED = true;
 
     /**
      * Default cadence while driving. 60 s is roughly 1.5 km between points at motorway
@@ -44,18 +46,26 @@ final class UploadSettings {
     final int intervalSec;
     final boolean boostLowSoc;
     final int lowSocPercent;
+    final boolean abrpUploadEnabled;
 
     UploadSettings(int intervalSec, boolean boostLowSoc, int lowSocPercent) {
+        this(intervalSec, boostLowSoc, lowSocPercent, DEFAULT_ABRP_UPLOAD_ENABLED);
+    }
+
+    UploadSettings(int intervalSec, boolean boostLowSoc, int lowSocPercent,
+                   boolean abrpUploadEnabled) {
         this.intervalSec = intervalSec;
         this.boostLowSoc = boostLowSoc;
         this.lowSocPercent = lowSocPercent;
+        this.abrpUploadEnabled = abrpUploadEnabled;
     }
 
     static UploadSettings from(SharedPreferences prefs) {
         return new UploadSettings(
                 prefs.getInt(KEY_INTERVAL_SEC, DEFAULT_INTERVAL_SEC),
                 prefs.getBoolean(KEY_BOOST_LOW_SOC, DEFAULT_BOOST_LOW_SOC),
-                prefs.getInt(KEY_LOW_SOC_PERCENT, DEFAULT_LOW_SOC_PERCENT));
+                prefs.getInt(KEY_LOW_SOC_PERCENT, DEFAULT_LOW_SOC_PERCENT),
+                prefs.getBoolean(KEY_ABRP_UPLOAD_ENABLED, DEFAULT_ABRP_UPLOAD_ENABLED));
     }
 
     static UploadSettings defaults() {