fix WiFi SSID preference

nightscout · Apr 29, 2024 · 3f8d4c0 · 3f8d4c0
1 parent 05ed109
commit 3f8d4c0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/NSClientPlugin.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/NSClientPlugin.kt
@@ -299,7 +299,12 @@ class NSClientPlugin @Inject constructor(
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseCellular, title = R.string.ns_cellular))
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseRoaming, title = R.string.ns_allow_roaming))
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseWifi, title = R.string.ns_wifi))
-                addPreference(AdaptiveStringPreference(ctx = context, stringKey = StringKey.NsClientWifiSsids, dialogMessage = R.string.ns_wifi_allowed_ssids, title = R.string.ns_wifi_ssids))
+                addPreference(
+                    AdaptiveStringPreference(
+                        ctx = context, stringKey = StringKey.NsClientWifiSsids, dialogMessage = R.string.ns_wifi_allowed_ssids, title = R.string.ns_wifi_ssids,
+                        validatorParams = DefaultEditTextValidator.Parameters(emptyAllowed = true)
+                    )
+                )
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseOnBattery, title = R.string.ns_battery))
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseOnCharging, title = R.string.ns_charging))
             })

diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3Plugin.kt
@@ -822,7 +822,12 @@ class NSClientV3Plugin @Inject constructor(
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseCellular, title = R.string.ns_cellular))
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseRoaming, title = R.string.ns_allow_roaming))
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseWifi, title = R.string.ns_wifi))
-                addPreference(AdaptiveStringPreference(ctx = context, stringKey = StringKey.NsClientWifiSsids, dialogMessage = R.string.ns_wifi_allowed_ssids, title = R.string.ns_wifi_ssids))
+                addPreference(
+                    AdaptiveStringPreference(
+                        ctx = context, stringKey = StringKey.NsClientWifiSsids, dialogMessage = R.string.ns_wifi_allowed_ssids, title = R.string.ns_wifi_ssids,
+                        validatorParams = DefaultEditTextValidator.Parameters(emptyAllowed = true)
+                    )
+                )
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseOnBattery, title = R.string.ns_battery))
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.NsClientUseOnCharging, title = R.string.ns_charging))
             })

diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt
@@ -137,7 +137,7 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag
                     val pump = activePlugin.activePump
                     val quickWizardEntry = quickWizard[position]
 
-                    if (quickWizardEntry != null && actualBg != null && profile != null) {
+                    if (actualBg != null && profile != null) {
                         val wizard = quickWizardEntry.doCalc(profile, profileName, actualBg)
 
                         if (wizard.calculatedTotalInsulin > 0.0 && quickWizardEntry.carbs() > 0.0) {

diff --git a/ui/src/main/kotlin/app/aaps/ui/dialogs/EditQuickWizardDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/EditQuickWizardDialog.kt
@@ -196,9 +196,7 @@ class EditQuickWizardDialog : DaggerDialogFragment(), View.OnClickListener {
             useECarbs(checkedId)
         }
 
-        binding.useIob.setOnCheckedChangeListener { _, checkedId ->
-            processIOB()
-        }
+        binding.useIob.setOnCheckedChangeListener { _, _ -> processIOB() }
 
         val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble()
 
@@ -272,13 +270,9 @@ class EditQuickWizardDialog : DaggerDialogFragment(), View.OnClickListener {
         binding.duration.value = SafeParse.stringToDouble(entry.duration().toString())
         useECarbs(radioNumbersToCheckBox(entry.useEcarbs()))
 
-        binding.useCob.setOnCheckedChangeListener { _, checkedId ->
-            processCob()
-        }
+        binding.useCob.setOnCheckedChangeListener { _, _ -> processCob() }
 
-        binding.useTrendCheckbox.setOnCheckedChangeListener { _, checkedId ->
-            processTrend()
-        }
+        binding.useTrendCheckbox.setOnCheckedChangeListener { _, _ -> processTrend() }
 
         processCob()
         processIOB()