Skip to content

Fix Crash #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Philoul wants to merge 2 commits into
base: andy_tandem_dev4
Choose a base branch
from
Open

Fix Crash #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b11979
Fix Crash
Philoul May 12, 2026
e5ba44f
Update Insulin Values with ConcentrationHelper
Philoul May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pump/tandem/src/main/kotlin/app/aaps/pump/tandem/mobi/ui/TandemUiController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ class TandemUiController @Inject constructor(
tandemPumpUtil.refreshPumpStatus(listOf(RefreshData.SEMAPHORE_EVENTS))
}

this.tandemUICommunication.tandemCommunicationManager = null
if (::tandemUICommunication.isInitialized) {
this.tandemUICommunication.tandemCommunicationManager = null
}
}

enum class AdditionalConfigurationScreens {
Expand Down
40 changes: 12 additions & 28 deletions pump/tandem/src/main/kotlin/app/aaps/pump/tandem/mobi/ui/overview/MobiOverviewViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.logging.UserEntryLogger
import app.aaps.core.interfaces.plugin.ActivePlugin
import app.aaps.core.interfaces.pump.PumpInsulin
import app.aaps.core.interfaces.pump.PumpRate
import app.aaps.core.interfaces.queue.Callback
import app.aaps.core.interfaces.queue.CommandQueue
import app.aaps.core.interfaces.resources.ResourceHelper
Expand Down Expand Up @@ -283,9 +284,7 @@ open class MobiOverviewViewModel @Inject constructor(
updateType == PumpUpdateFragmentType.Full) {

// base basal rate
baseBasalRate.value = rh.gs(Rc.string.pump_base_basal_rate_with_profile,
tandemPumpStatus.activeProfileName,
tandemPump.baseBasalRate.cU)
baseBasalRate.value = ch.basalRateString(tandemPump.baseBasalRate, true)

// tbr (always saved on pumpStatus)
updateTBR()
Expand Down Expand Up @@ -770,12 +769,12 @@ open class MobiOverviewViewModel @Inject constructor(


private fun updateReservoir() {
val remaining = tandemPumpStatus.reservoirRemainingUnits
val full = tandemPumpStatus.reservoirFullUnits
reservoirText.value = rh.gs(Rc.string.reservoir_value, remaining, full)
val remaining = PumpInsulin(tandemPumpStatus.reservoirRemainingUnits)
//val full = tandemPumpStatus.reservoirFullUnits
reservoirText.value = ch.insulinAmountString(remaining)
reservoirLevel.value = when {
remaining <= 20.0 -> StatusLevel.CRITICAL
remaining <= 50.0 -> StatusLevel.WARNING
ch.fromPump(remaining) <= 20.0 -> StatusLevel.CRITICAL
ch.fromPump(remaining) <= 50.0 -> StatusLevel.WARNING
else -> StatusLevel.NORMAL
}
}
Expand Down Expand Up @@ -828,22 +827,7 @@ open class MobiOverviewViewModel @Inject constructor(
val bolus = tandemPumpStatus.tandemLastBolus

lastBolusValue.value = if (bolus != null) {
val agoMsc = System.currentTimeMillis() - bolus.timestamp
val bolusMinAgo = agoMsc.toDouble() / 60.0 / 1000.0
val unit = rh.gs(Rco.string.insulin_unit_shortname)
val ago: String
if (agoMsc < 60 * 1000) {
ago = rh.gs(Rc.string.time_now)
} else if (bolusMinAgo < 60) {
ago = dateUtil.minAgo(rh, bolus.timestamp)
} else if (bolusMinAgo < (60*24)) {
ago = dateUtil.hourAgo(bolus.timestamp, rh)
} else if (bolusMinAgo < (60*24*30)) {
ago = dateUtil.dayAgo(bolus.timestamp, rh)
} else {
ago = rh.gs(Rc.string.time_over_month_ago)
}
rh.gs(R.string.pump_last_bolus, bolus.amountImmediateDelivered, unit, ago)
ch.insulinAmountAgoString(PumpInsulin(bolus.amountImmediateDelivered!!), bolus.timestamp) ?:PLACEHOLDER
} else {
PLACEHOLDER
}
Expand All @@ -855,10 +839,10 @@ open class MobiOverviewViewModel @Inject constructor(
tandemPumpStatus.clearTbr()
pumpTempBasal.value = PLACEHOLDER
} else {
val msDiff = tandemPumpStatus.currentTempBasalEstimatedEnd!! - System.currentTimeMillis()
val min = msDiff / (60.0 * 1000.0)
pumpTempBasal.value = rh.gs(Rc.string.pump_tbr_remaining_percent,
tandemPumpStatus.currentTempBasal!!.insulinRate.toInt(), min.toInt())
val rate = PumpRate(tandemPumpStatus.currentTempBasal!!.insulinRate)
val startTime = tandemPumpStatus.currentTempBasal!!.start!!
val durationInMin = tandemPumpStatus.currentTempBasal!!.durationMinutes
pumpTempBasal.value = ch.basalTbrString(rate, startTime, durationInMin = durationInMin, isAbsolute = false)
}
}

Expand Down