cleanup and formatting

nightscout · Nov 1, 2024 · 1a40163 · 1a40163
1 parent b8cbaf9
commit 1a40163
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -239,7 +239,7 @@ println("-------------------")
 if (isMaster() && !gitAvailable()) {
     throw GradleException("GIT system is not available. On Windows try to run Android Studio as an Administrator. Check if GIT is installed and Studio have permissions to use it")
 }
-// if (isMaster() && !allCommitted()) {
-//     throw GradleException("There are uncommitted changes. Clone sources again as described in wiki and do not allow gradle update")
-// }
+if (isMaster() && !allCommitted()) {
+    throw GradleException("There are uncommitted changes. Clone sources again as described in wiki and do not allow gradle update")
+}
 
diff --git a/core/objects/src/main/kotlin/app/aaps/core/objects/wizard/BolusWizard.kt b/core/objects/src/main/kotlin/app/aaps/core/objects/wizard/BolusWizard.kt
@@ -36,11 +36,12 @@ import app.aaps.core.interfaces.resources.ResourceHelper
 import app.aaps.core.interfaces.rx.bus.RxBus
 import app.aaps.core.interfaces.rx.events.EventRefreshOverview
 import app.aaps.core.interfaces.sharedPreferences.SP
+import app.aaps.core.interfaces.smsCommunicator.Sms
+import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
 import app.aaps.core.interfaces.ui.UiInteraction
 import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.interfaces.utils.DecimalFormatter
 import app.aaps.core.interfaces.utils.Round
-import app.aaps.core.interfaces.utils.SafeParse
 import app.aaps.core.keys.BooleanKey
 import app.aaps.core.keys.Preferences
 import app.aaps.core.keys.StringKey
@@ -53,8 +54,6 @@ import app.aaps.core.ui.dialogs.OKDialog
 import app.aaps.core.utils.HtmlHelper
 import app.aaps.core.utils.JsonHelper
 import dagger.android.HasAndroidInjector
-import app.aaps.core.interfaces.smsCommunicator.Sms
-import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
 import java.util.Calendar
 import java.util.LinkedList
 import javax.inject.Inject
@@ -377,8 +376,8 @@ class BolusWizard @Inject constructor(
                     .formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)
             )
         if (config.NSCLIENT && insulinAfterConstraints > 0)
-            if(config.NSCLIENT && !phoneNumber.isNullOrBlank())
-                actions.add((rh.gs(app.aaps.core.ui.R.string.sms_bolus_notification)+"bolusWizard.kt").formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
+            if (!phoneNumber.isNullOrBlank())
+                actions.add(rh.gs(app.aaps.core.ui.R.string.sms_bolus_notification).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
             else
                 actions.add(rh.gs(app.aaps.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
         if (useAlarm && !advisor && carbs > 0 && carbTime > 0)
@@ -547,7 +546,7 @@ class BolusWizard @Inject constructor(
                                 ValueWithUnit.Minute(carbTime).takeIf { carbTime != 0 })
                         )
                         var phoneNumber = preferences.get(StringKey.SmsReceiverNumber)
-                        if (config.NSCLIENT && !phoneNumber.isNullOrBlank()) {
+                        if (!phoneNumber.isNullOrBlank()) {
                             rh.gs(app.aaps.core.ui.R.string.sms_bolus_notification).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)
                             smsCommunicator.sendSMS(Sms(phoneNumber, rh.gs(app.aaps.core.ui.R.string.bolus) + " " + insulin))
                         } else if (!config.APS)
@@ -559,9 +558,7 @@ class BolusWizard @Inject constructor(
                                 }
                             })
                     }
-                    bolusCalculatorResult?.let {
-                        persistenceLayer.insertOrUpdateBolusCalculatorResult(it).blockingGet()
-                    }
+                    bolusCalculatorResult?.let { persistenceLayer.insertOrUpdateBolusCalculatorResult(it).blockingGet() }
                 }
                 if (useAlarm && carbs > 0 && carbTime > 0) {
                     automation.scheduleTimeToEatReminder(T.mins(carbTime.toLong()).secs().toInt())

diff --git a/ui/src/main/kotlin/app/aaps/ui/dialogs/InsulinDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/InsulinDialog.kt
@@ -211,8 +211,8 @@ class InsulinDialog : DialogFragmentWithDate() {
             )
             if (recordOnlyChecked)
                 actions.add(rh.gs(app.aaps.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
-            else if(config.NSCLIENT && !phoneNumber.isNullOrBlank())
-                actions.add((rh.gs(app.aaps.core.ui.R.string.sms_bolus_notification) + "insulinDialog.kt").formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
+            else if(!phoneNumber.isNullOrBlank())
+                actions.add(rh.gs(app.aaps.core.ui.R.string.sms_bolus_notification).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
 
             if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
                 actions.add(

diff --git a/ui/src/main/kotlin/app/aaps/ui/dialogs/TreatmentDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/TreatmentDialog.kt
@@ -23,11 +23,11 @@ import app.aaps.core.interfaces.pump.defs.determineCorrectBolusStepSize
 import app.aaps.core.interfaces.queue.Callback
 import app.aaps.core.interfaces.queue.CommandQueue
 import app.aaps.core.interfaces.resources.ResourceHelper
+import app.aaps.core.interfaces.smsCommunicator.Sms
+import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
 import app.aaps.core.interfaces.ui.UiInteraction
 import app.aaps.core.interfaces.utils.DecimalFormatter
 import app.aaps.core.interfaces.utils.SafeParse
-import app.aaps.core.interfaces.smsCommunicator.Sms
-import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
 import app.aaps.core.keys.StringKey
 import app.aaps.core.objects.constraints.ConstraintObject
 import app.aaps.core.objects.extensions.formatColor
@@ -161,8 +161,11 @@ class TreatmentDialog : DialogFragmentWithDate() {
             if (recordOnlyChecked)
                 actions.add(rh.gs(app.aaps.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
             else if (!phoneNumber.isNullOrBlank())
-                actions.add((rh.gs(
-                    app.aaps.core.ui.R.string.sms_bolus_notification)+"treatmentdialog.kt").formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
+                actions.add(
+                    rh.gs(
+                        app.aaps.core.ui.R.string.sms_bolus_notification
+                    ).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)
+                )
 
             if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
                 actions.add(
@@ -194,21 +197,22 @@ class TreatmentDialog : DialogFragmentWithDate() {
                     detailedBolusInfo.context = context
                     if (recordOnlyChecked) {
                         if (detailedBolusInfo.insulin > 0)
-                            disposable += persistenceLayer.insertOrUpdateBolus(
-                                bolus = detailedBolusInfo.createBolus(),
-                                action = action,
-                                source = Sources.TreatmentDialog,
-                                note = if (insulinAfterConstraints != 0.0) rh.gs(app.aaps.core.ui.R.string.record) else ""
-                            ).subscribe()
+                            if (!phoneNumber.isNullOrBlank())
+                                smsCommunicator.sendSMS(Sms(phoneNumber, rh.gs(app.aaps.core.ui.R.string.bolus) + " " + detailedBolusInfo.insulin))
+                            else
+                                disposable += persistenceLayer.insertOrUpdateBolus(
+                                    bolus = detailedBolusInfo.createBolus(),
+                                    action = action,
+                                    source = Sources.TreatmentDialog,
+                                    note = if (insulinAfterConstraints != 0.0) rh.gs(app.aaps.core.ui.R.string.record) else ""
+                                ).subscribe()
                         if (detailedBolusInfo.carbs > 0)
                             disposable += persistenceLayer.insertOrUpdateCarbs(
                                 carbs = detailedBolusInfo.createCarbs(),
                                 action = action,
                                 source = Sources.TreatmentDialog,
                                 note = if (carbsAfterConstraints != 0) rh.gs(app.aaps.core.ui.R.string.record) else ""
                             ).subscribe()
-                    } else if(phoneNumber.isNullOrBlank()){
-                        smsCommunicator.sendSMS(Sms(phoneNumber, rh.gs(app.aaps.core.ui.R.string.bolus) + " " + detailedBolusInfo.insulin))
                     } else {
                         if (detailedBolusInfo.insulin > 0) {
                             uel.log(