Allow configuring pump type in NSClient

app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt

@@ -175,7 +175,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(localInsightPlugin, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(comboPlugin, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(medtronicPumpPlugin, rootKey, config.PUMPDRIVERS)
-            addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey, !config.NSCLIENT)
+            addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(insulinOrefFreePeakPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(nsClientPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(tidepoolPlugin, rootKey)

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective0.java

@@ -48,7 +48,7 @@ public class Objective0 extends Objective {
         tasks.add(new Task(R.string.virtualpump_uploadstatus_title) {
             @Override
             public boolean isCompleted() {
-                return sp.getBoolean("virtualpump_uploadstatus", false);
+                return sp.getBoolean(R.string.key_virtualpump_uploadstatus, false);
             }
 
             @Override

app/src/main/java/info/nightscout/androidaps/plugins/general/openhumans/AllowedPreferenceKeys.kt

@@ -185,7 +185,7 @@ private val allowedKeys = """
     tidepool_only_while_charging
     tidepool_only_while_unmetered
     virtualpump
-    virtualpump_uploadstatus
+    key_virtualpump_uploadstatus
     virtualpump_type
     wearplugin
     wearcontrol

app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt

@@ -1,6 +1,8 @@
 package info.nightscout.androidaps.plugins.pump.virtual
 
 import android.os.SystemClock
+import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.SwitchPreference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.Config
 import info.nightscout.androidaps.R
@@ -59,7 +61,6 @@ class VirtualPumpPlugin @Inject constructor(
     .pluginName(R.string.virtualpump)
     .shortName(R.string.virtualpump_shortname)
     .preferencesId(R.xml.pref_virtualpump)
-    .neverVisible(config.NSCLIENT)
     .description(R.string.description_pump_virtual)
     .setDefault(),
     injector, aapsLogger, resourceHelper, commandQueue
@@ -120,6 +121,13 @@ class VirtualPumpPlugin @Inject constructor(
         super.onStop()
     }
 
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
+        super.preprocessPreferences(preferenceFragment)
+        val uploadStatus = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_virtualpump_uploadstatus)) as SwitchPreference?
+            ?: return
+        uploadStatus.isVisible = !config.NSCLIENT
+    }
+
     override fun isFakingTempsByExtendedBoluses(): Boolean {
         return config.NSCLIENT && getFakingStatus()
     }
@@ -332,7 +340,7 @@ class VirtualPumpPlugin @Inject constructor(
 
     override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
         val now = System.currentTimeMillis()
-        if (!sp.getBoolean("virtualpump_uploadstatus", false)) {
+        if (!sp.getBoolean(R.string.key_virtualpump_uploadstatus, false)) {
             return JSONObject()
         }
         val pump = JSONObject()

app/src/main/res/values/strings.xml

@@ -921,6 +921,7 @@
     <string name="openapsama_current_basal_safety_multiplier">Current basal safety multiplier</string>
     <string name="value_unavailable_short">n/a</string>
     <string name="key_virtualpump_type" translatable="false">virtualpump_type</string>
+    <string name="key_virtualpump_uploadstatus" translatable="false">virtualpump_uploadstatus</string>
     <string name="virtualpump_type">Virtual Pump Type</string>
     <string name="virtualpump_definition">Pump Definition</string>
     <string name="virtualpump_pump_def">Bolus: Step=%1$s\nExtended Bolus: [Step=%2$s, Duration=%3$smin-%4$sh]\nBasal: Step=%5$s\nTBR: %6$s (by %7$s), Duration=%8$smin-%9$sh\n%10$s</string>

app/src/main/res/xml/pref_virtualpump.xml

@@ -15,7 +15,7 @@
 
         <SwitchPreference
             android:defaultValue="false"
-            android:key="virtualpump_uploadstatus"
+            android:key="@string/key_virtualpump_uploadstatus"
             android:title="@string/virtualpump_uploadstatus_title" />
 
     </PreferenceCategory>