caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #758 from samspycher/fix/db-access-expectedPumpState

Browse source 
Fix: prevent DB access on main thread for `expectedPumpState()`
This commit is contained in:
Milos Kozak 2021-10-18 23:55:45 +02:00 committed by GitHub
parent f22489e87e b5962ab07a
commit 68f674fd92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt
View file

@ -77,7 +77,7 @@ class PumpSyncImplementation @Inject constructor(
} }
override fun expectedPumpState(): PumpSync.PumpState { override fun expectedPumpState(): PumpSync.PumpState {
val bolus = repository.getLastBolusRecord() val bolus = repository.getLastBolusRecordWrapped().blockingGet();
val temporaryBasal = repository.getTemporaryBasalActiveAt(dateUtil.now()).blockingGet() val temporaryBasal = repository.getTemporaryBasalActiveAt(dateUtil.now()).blockingGet()
val extendedBolus = repository.getExtendedBolusActiveAt(dateUtil.now()).blockingGet() val extendedBolus = repository.getExtendedBolusActiveAt(dateUtil.now()).blockingGet()
@ -104,12 +104,14 @@ class PumpSyncImplementation @Inject constructor(
) )
else null, else null,
bolus = bolus =
bolus?.let { if (bolus is ValueWrapper.Existing)
PumpSync.PumpState.Bolus( bolus.value.let {
timestamp = bolus.timestamp, PumpSync.PumpState.Bolus(
amount = bolus.amount timestamp = bolus.value.timestamp,
) amount = bolus.value.amount
}, )
}
else null,
profile = profileFunction.getProfile() profile = profileFunction.getProfile()
) )
} }