caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix progress bar

Browse source
This commit is contained in:
Andrei Vereha 2021-06-19 17:05:37 +02:00
parent d299b03ca2
commit e0b33c74a1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt
View file

@ -383,14 +383,14 @@ class OmnipodDashPumpPlugin @Inject constructor(
} }
private fun waitForBolusDeliveryToComplete( private fun waitForBolusDeliveryToComplete(
maxRetries: Int, maxTries: Int,
requestedBolusAmount: Double, requestedBolusAmount: Double,
bolusType: DetailedBolusInfo.BolusType bolusType: DetailedBolusInfo.BolusType
): Single<Double> = Single.defer { ): Single<Double> = Single.defer {
if (bolusCanceled && podStateManager.activeCommand != null) { if (bolusCanceled && podStateManager.activeCommand != null) {
var errorGettingStatus: Throwable? = null var errorGettingStatus: Throwable? = null
for (tries in 1..maxRetries) { for (tries in 1..maxTries) {
errorGettingStatus = getPodStatus().blockingGet() errorGettingStatus = getPodStatus().blockingGet()
if (errorGettingStatus != null) { if (errorGettingStatus != null) {
aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$errorGettingStatus") aapsLogger.debug(LTag.PUMP, "waitForBolusDeliveryToComplete errorGettingStatus=$errorGettingStatus")
@ -414,11 +414,13 @@ class OmnipodDashPumpPlugin @Inject constructor(
if (bolusType == DetailedBolusInfo.BolusType.SMB) { if (bolusType == DetailedBolusInfo.BolusType.SMB) {
continue continue
} }
val percent = waited.toFloat() / estimatedDeliveryTimeSeconds val percent = (waited.toFloat() / estimatedDeliveryTimeSeconds) * 100
updateBolusProgressDialog(resourceHelper.gs(R.string.bolusdelivering, requestedBolusAmount), percent.toInt()) updateBolusProgressDialog(resourceHelper.gs(R.string.bolusdelivering, requestedBolusAmount), percent.toInt())
} }
for (tries in 1..maxRetries) { for (tryNumber in 1..maxTries) {
updateBolusProgressDialog("Checking delivery status. Try: $tryNumber/$maxTries", 100.toInt())
val cmd = if (bolusCanceled) val cmd = if (bolusCanceled)
cancelBolus() cancelBolus()
else else