sms bolus from AAPSClient #3507
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,12 +37,16 @@ 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.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.Preferences | ||
| import app.aaps.core.keys.StringKey | ||
| import app.aaps.core.objects.constraints.ConstraintObject | ||
| import app.aaps.core.objects.extensions.formatColor | ||
| import app.aaps.core.objects.extensions.highValueToUnitsToString | ||
|
|
@@ -63,6 +67,7 @@ class BolusWizard @Inject constructor( | |
| val injector: HasAndroidInjector | ||
| ) { | ||
|
|
||
| @Inject lateinit var smsCommunicator: SmsCommunicator | ||
| @Inject lateinit var aapsLogger: AAPSLogger | ||
| @Inject lateinit var rh: ResourceHelper | ||
| @Inject lateinit var rxBus: RxBus | ||
|
|
@@ -86,9 +91,12 @@ class BolusWizard @Inject constructor( | |
| @Inject lateinit var processedDeviceStatusData: ProcessedDeviceStatusData | ||
|
|
||
| var timeStamp: Long | ||
| // var phoneNumber: String | ||
|
Contributor
There was a problem hiding this comment. review https://github.com/nightscout/AndroidAPS/pull/3507/files and cleanup the code |
||
|
|
||
| init { | ||
| injector.androidInjector().inject(this) | ||
| // why this@BolusWizar.phoneNumber not visible in scoped DetailedBolusInfo().apply | ||
| // phoneNumber = preferences.get(StringKey.SmsReceiverNumber) | ||
| timeStamp = dateUtil.now() | ||
| } | ||
|
|
||
|
|
@@ -330,7 +338,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 "" | ||
|
|
@@ -370,8 +378,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) | ||
| ) | ||
| val bolusOrCarbs = (insulinAfterConstraints > 0 || carbs > 0) | ||
| if (config.AAPSCLIENT && bolusOrCarbs) | ||
| if (preferences.get(BooleanKey.SmsAllowRemoteCommands) && !phoneNumber.isNullOrBlank() && bolusOrCarbs) | ||
| 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) | ||
|
|
@@ -421,6 +433,14 @@ class BolusWizard @Inject constructor( | |
| } | ||
|
|
||
| private fun bolusAdvisorProcessing(ctx: Context) { | ||
| val phoneNumber = preferences.get(StringKey.SmsReceiverNumber) | ||
| if (preferences.get(BooleanKey.SmsAllowRemoteCommands) && !phoneNumber.isNullOrBlank()) { | ||
| // 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 { | ||
|
|
@@ -538,15 +558,21 @@ class BolusWizard @Inject constructor( | |
| ValueWithUnit.Minute(carbTime).takeIf { carbTime != 0 } | ||
| ).filterNotNull() | ||
| ) | ||
| val phoneNumber = preferences.get(StringKey.SmsReceiverNumber) | ||
| if (preferences.get(BooleanKey.SmsAllowRemoteCommands) && !phoneNumber.isNullOrBlank()) { | ||
|
jgr-lab marked this conversation as resolved.
Outdated
|
||
| 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() } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
15 minutes seems to be too much. In my case I've set some max carbs limit for single meal. It's intended to limit bolus to make sure carbs absorption kicks in on time. When meal is bigger than max carb then I split calculations into 2 meal with 5 minutes delay. 5 should also prevent accidental bolus at the same time from multiple caregivers
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Totally agree. I have the same process in place with the treatment on my two kids. Set bolus limit for safety, leading to mandatory split bolus for regular meals.