sms bolus from AAPSClient

core/data/src/main/kotlin/app/aaps/core/data/configuration/Constants.kt

@@ -11,7 +11,7 @@ object Constants {
     const val notificationID = 556677
 
     // SMS COMMUNICATOR
-    const val remoteBolusMinDistance = 15 * 60 * 1000L
+    const val remoteBolusMinDistance = 5 * 60 * 1000L
 
     // Circadian Percentage Profile
     const val CPP_MIN_PERCENTAGE = 30

core/interfaces/src/main/kotlin/app/aaps/core/interfaces/smsCommunicator/SmsUtils.kt

@@ -0,0 +1,17 @@
+package app.aaps.core.interfaces.smsCommunicator
+
+fun formatBolusCarbsCommand(insulin: Double, carbs: Int, time: String? = null, set_alarm: Boolean = false): String {
+    var msg = "Boluscarbs " + "%.2f ".format(insulin) + carbs.toString()
+    if (!time.isNullOrEmpty()) {
+        if (time.all { it.isDigit() })
+        // xx min offset
+            msg += " +" + time
+        else
+        // either of -yy, +xx, 1:23, 2:34PM
+            msg += " " + time
+
+        if (set_alarm == true)
+            msg += " alarm"
+    }
+    return msg
+}

core/keys/src/main/kotlin/app/aaps/core/keys/BooleanKey.kt

@@ -73,7 +73,7 @@ enum class BooleanKey(
     AutotuneCircadianIcIsf("autotune_circadian_ic_isf", false),
     AutotuneAdditionalLog("autotune_additional_log", false),
 
-    SmsAllowRemoteCommands("smscommunicator_remotecommandsallowed", false),
+    SmsAllowRemoteCommands("smscommunicator_remotecommandsallowed", false, showInApsMode = false, showInPumpControlMode = false),
     SmsReportPumpUnreachable("smscommunicator_report_pump_unreachable", true),
 
     VirtualPumpStatusUpload("virtualpump_uploadstatus", false, showInNsClientMode = false),

core/keys/src/main/kotlin/app/aaps/core/keys/StringKey.kt

@@ -42,6 +42,7 @@ enum class StringKey(
     AutomationLocation("location", "PASSIVE", hideParentScreenIfHidden = true),
 
     SmsAllowedNumbers("smscommunicator_allowednumbers", ""),
+    SmsReceiverNumber("sms_communicator_receiver_number", "", showInApsMode = false, showInPumpControlMode = false, dependency = BooleanKey.SmsAllowRemoteCommands),
     SmsOtpPassword("smscommunicator_otp_password", "", dependency = BooleanKey.SmsAllowRemoteCommands, isPassword = true),
 
     VirtualPumpType("virtualpump_type", "Generic AAPS"),

core/objects/src/main/kotlin/app/aaps/core/objects/wizard/BolusWizard.kt

@@ -36,11 +36,15 @@ import app.aaps.core.interfaces.queue.CommandQueue
 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.smsCommunicator.Sms
+import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
+import app.aaps.core.interfaces.smsCommunicator.formatBolusCarbsCommand
 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.keys.BooleanKey
+import app.aaps.core.keys.StringKey
 import app.aaps.core.keys.interfaces.Preferences
 import app.aaps.core.objects.constraints.ConstraintObject
 import app.aaps.core.objects.extensions.formatColor
@@ -58,6 +62,7 @@ import kotlin.math.max
 import kotlin.math.min
 
 class BolusWizard @Inject constructor(
+    private val smsCommunicator: SmsCommunicator,
     private val aapsLogger: AAPSLogger,
     private val rh: ResourceHelper,
     private val rxBus: RxBus,
@@ -79,7 +84,6 @@ class BolusWizard @Inject constructor(
     private val decimalFormatter: DecimalFormatter,
     private val processedDeviceStatusData: ProcessedDeviceStatusData
 ) {
-
     var timeStamp = dateUtil.now()
 
     // Intermediate
@@ -320,7 +324,7 @@ class BolusWizard @Inject constructor(
     }
 
     private fun confirmMessageAfterConstraints(context: Context, advisor: Boolean, quickWizardEntry: QuickWizardEntry? = null): Spanned {
-
+        val phoneNumber = preferences.get(StringKey.SmsReceiverNumber)
         val actions: LinkedList<String> = LinkedList()
         if (insulinAfterConstraints > 0) {
             val pct = if (percentageCorrection != 100) " ($percentageCorrection%)" else ""
@@ -360,8 +364,12 @@ class BolusWizard @Inject constructor(
                 rh.gs(app.aaps.core.ui.R.string.bolus_constraint_applied_warn, calculatedTotalInsulin, insulinAfterConstraints)
                     .formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)
             )
-        if (config.AAPSCLIENT && insulinAfterConstraints > 0)
-            actions.add(rh.gs(app.aaps.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor))
+        val bolusOrCarbs = (insulinAfterConstraints > 0 || carbs > 0)
+        if (config.AAPSCLIENT && bolusOrCarbs)
+            if (preferences.get(BooleanKey.SmsAllowRemoteCommands) && phoneNumber.isNotBlank())
+                actions.add(rh.gs(app.aaps.core.ui.R.string.sms_request_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)
             actions.add(rh.gs(app.aaps.core.ui.R.string.alarminxmin, carbTime).formatColor(context, rh, app.aaps.core.ui.R.attr.infoColor))
         if (advisor)
@@ -412,6 +420,14 @@ class BolusWizard @Inject constructor(
     }
 
     private fun bolusAdvisorProcessing(ctx: Context) {
+        val phoneNumber = preferences.get(StringKey.SmsReceiverNumber)
+        if (preferences.get(BooleanKey.SmsAllowRemoteCommands) && phoneNumber.isNotBlank()) {
+            // Bolus advisor is not supported because automation.scheduleAutomationEventEatReminder() can't be set on AAPSClient phone.
+            // In order to do so AAPSClient phone would need to wait in pooling for bolus confirmation message. I don't want to block app on that.
+            OKDialog.show(ctx, rh.gs(app.aaps.core.ui.R.string.boluswizard), rh.gs(app.aaps.core.ui.R.string.bolus_advisor_not_supported))
+            return
+        }
+
         val confirmMessage = confirmMessageAfterConstraints(ctx, advisor = true)
         OKDialog.showConfirmation(ctx, rh.gs(app.aaps.core.ui.R.string.boluswizard), confirmMessage, {
             DetailedBolusInfo().apply {
@@ -536,15 +552,21 @@ class BolusWizard @Inject constructor(
                                 ValueWithUnit.Minute(carbTime).takeIf { carbTime != 0 }
                             )
                         )
-                        commandQueue.bolus(this, object : Callback() {
-                            override fun run() {
-                                if (!result.success) {
-                                    uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror)
-                                } else if (useAlarm && carbs > 0 && carbTime > 0) {
-                                    automation.scheduleTimeToEatReminder(T.mins(carbTime.toLong()).secs().toInt())
+                        val phoneNumber = preferences.get(StringKey.SmsReceiverNumber)
+                        if (preferences.get(BooleanKey.SmsAllowRemoteCommands) && phoneNumber.isNotBlank()) {
+                            rh.gs(app.aaps.core.ui.R.string.sms_request_notification).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)
+                            smsCommunicator.sendSMS(Sms(phoneNumber, formatBolusCarbsCommand(insulin, this@BolusWizard.carbs, this@BolusWizard.carbTime.toString(), useAlarm)))
+                        } else {
+                            commandQueue.bolus(this, object : Callback() {
+                                override fun run() {
+                                    if (!result.success) {
+                                        uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror)
+                                    } else if (config.APS && useAlarm && carbs > 0 && carbTime > 0) {
+                                        automation.scheduleTimeToEatReminder(T.mins(carbTime.toLong()).secs().toInt())
+                                    }
                                 }
-                            }
-                        })
+                            })
+                        }
                     }
                     bolusCalculatorResult?.let { persistenceLayer.insertOrUpdateBolusCalculatorResult(it).blockingGet() }
                 }

core/ui/src/main/res/values/strings.xml

@@ -498,13 +498,16 @@
     <!-- BolusWizard -->
     <string name="bolus_advisor">Bolus advisor</string>
     <string name="bolus_advisor_message">You have high glycemia. Instead of eating now it\'s recommended to wait for better glycemia. Do you want to do a correction bolus now and remind you when it\'s time to eat? In this case no carbs will be recorded and you must use wizard again when we remind you.</string>
+    <string name="bolus_advisor_not_supported">Bolus advisor doesn\'t work with SMS commands. Wait till BG drops or provide correction bolus using Insulin or Treatment buttons.</string>
 
     <string name="cobvsiob">COB vs IOB</string>
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Slow carbs absorption detected: %2$d%% of time. Double check your calculation. COB can be overestimated thus more insulin could be given !!!!!</font>]]></string>
     <string name="partialboluswizard">Deliver this part of bolus wizard result [%]</string>
+    <string name="sms_receiver_number">Receiver phone number for sms commands sent from AAPSClient phone</string>
     <string name="partialboluswizard_reset_time">Old glycemia time threshold [min]</string>
     <string name="bolus_constraint_applied_warn">Bolus constraint applied: %1$.2f U to %2$.2f U</string>
     <string name="bolus_recorded_only">Bolus will be recorded only (not delivered by pump)</string>
+    <string name="sms_request_notification">SMS command will be sent</string>
     <string name="advisoralarm">Run alarm when is time to eat</string>
     <string name="no_action_selected">No action selected, nothing will happen</string>
     <string name="carb_equal_zero_no_action">Carbs = 0. No action taken!</string>

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewPlugin.kt

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.graphics.Typeface
 import android.os.Build
 import android.widget.TextView
 import androidx.preference.PreferenceCategory
@@ -43,10 +42,13 @@ import app.aaps.core.keys.UnitDoubleKey
 import app.aaps.core.keys.interfaces.Preferences
 import app.aaps.core.objects.extensions.put
 import app.aaps.core.objects.extensions.store
+import app.aaps.core.validators.DefaultEditTextValidator
+import app.aaps.core.validators.EditTextValidator
 import app.aaps.core.validators.preferences.AdaptiveClickPreference
 import app.aaps.core.validators.preferences.AdaptiveDoublePreference
 import app.aaps.core.validators.preferences.AdaptiveIntPreference
 import app.aaps.core.validators.preferences.AdaptiveIntentPreference
+import app.aaps.core.validators.preferences.AdaptiveStringPreference
 import app.aaps.core.validators.preferences.AdaptiveSwitchPreference
 import app.aaps.core.validators.preferences.AdaptiveUnitPreference
 import app.aaps.plugins.main.R
@@ -236,6 +238,13 @@ class OverviewPlugin @Inject constructor(
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.OverviewShowTreatmentButton, title = R.string.treatments))
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.OverviewShowWizardButton, title = R.string.calculator_label))
                 addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.OverviewShowInsulinButton, title = app.aaps.core.ui.R.string.configbuilder_insulin))
+                addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.SmsAllowRemoteCommands, summary = R.string.client_allow_sms_warning, title = R.string.client_allow_sms))
+                addPreference(
+                    AdaptiveStringPreference(
+                        ctx = context, stringKey = StringKey.SmsReceiverNumber, dialogMessage = R.string.sms_receiver_number_dialog, title = app.aaps.core.ui.R.string.sms_receiver_number,
+                        validatorParams = DefaultEditTextValidator.Parameters(testType = EditTextValidator.TEST_PHONE)
+                    )
+                )
                 addPreference(AdaptiveDoublePreference(ctx = context, doubleKey = DoubleKey.OverviewInsulinButtonIncrement1, dialogMessage = R.string.insulin_increment_button_message, title = R.string.firstinsulinincrement))
                 addPreference(AdaptiveDoublePreference(ctx = context, doubleKey = DoubleKey.OverviewInsulinButtonIncrement2, dialogMessage = R.string.insulin_increment_button_message, title = R.string.secondinsulinincrement))
                 addPreference(AdaptiveDoublePreference(ctx = context, doubleKey = DoubleKey.OverviewInsulinButtonIncrement3, dialogMessage = R.string.insulin_increment_button_message, title = R.string.thirdinsulinincrement))
@@ -299,14 +308,17 @@ class OverviewPlugin @Inject constructor(
                 addPreference(AdaptiveIntPreference(ctx = context, intKey = IntKey.OverviewBageWarning, title = R.string.statuslights_bage_warning))
                 addPreference(AdaptiveIntPreference(ctx = context, intKey = IntKey.OverviewBageCritical, title = R.string.statuslights_bage_critical))
                 addPreference(
-                    AdaptiveClickPreference(ctx = context, stringKey = StringKey.OverviewCopySettingsFromNs, title = R.string.statuslights_copy_ns,
-                                            onPreferenceClickListener = {
-                                                nsSettingStatus.copyStatusLightsNsSettings(context)
-                                                true
-                                            })
+                    AdaptiveClickPreference(
+                        ctx = context, stringKey = StringKey.OverviewCopySettingsFromNs, title = R.string.statuslights_copy_ns,
+                        onPreferenceClickListener = {
+                            nsSettingStatus.copyStatusLightsNsSettings(context)
+                            true
+                        })
                 )
             })
             addPreference(AdaptiveIntPreference(ctx = context, intKey = IntKey.OverviewBolusPercentage, dialogMessage = R.string.deliverpartofboluswizard, title = app.aaps.core.ui.R.string.partialboluswizard))
+
+
             addPreference(AdaptiveIntPreference(ctx = context, intKey = IntKey.OverviewResetBolusPercentageTime, dialogMessage = R.string.deliver_part_of_boluswizard_reset_time, title = app.aaps.core.ui.R.string.partialboluswizard_reset_time))
             addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.OverviewUseBolusAdvisor, summary = R.string.enable_bolus_advisor_summary, title = R.string.enable_bolus_advisor))
             addPreference(AdaptiveSwitchPreference(ctx = context, booleanKey = BooleanKey.OverviewUseBolusReminder, summary = R.string.enablebolusreminder_summary, title = R.string.enablebolusreminder))

plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsAction.kt

@@ -4,6 +4,7 @@ abstract class SmsAction(val pumpCommand: Boolean) : Runnable {
 
     var aDouble: Double? = null
     var anInteger: Int? = null
+    private var aLong: Long? = null
     private var secondInteger: Int? = null
     private var secondLong: Long? = null
     private var aString: String? = null
@@ -31,8 +32,15 @@ abstract class SmsAction(val pumpCommand: Boolean) : Runnable {
         this.secondInteger = secondInteger
     }
 
-    internal constructor(pumpCommand: Boolean, anInteger: Int, secondLong: Long) : this(pumpCommand) {
+    internal constructor(pumpCommand: Boolean, anInteger: Int, aLong: Long) : this(pumpCommand) {
         this.anInteger = anInteger
+        this.aLong = aLong
+    }
+
+    internal constructor(pumpCommand: Boolean, aDouble: Double, anInteger: Int, aLong: Long, secondLong: Long) : this(pumpCommand) {
+        this.aDouble = aDouble
+        this.anInteger = anInteger
+        this.aLong = aLong
         this.secondLong = secondLong
     }
 
@@ -54,6 +62,12 @@ abstract class SmsAction(val pumpCommand: Boolean) : Runnable {
         } ?: throw IllegalStateException()
     }
 
+    fun aLong(): Long {
+        return aLong?.let {
+            aLong
+        } ?: throw IllegalStateException()
+    }
+
     fun secondLong(): Long {
         return secondLong?.let {
             secondLong