caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #666 from nightscout/revert-665-dev

Browse source 
Revert "NullPointerException while processing Bolus entries"
This commit is contained in:
Milos Kozak 2021-09-08 19:19:14 +02:00 committed by GitHub
commit 2cbfad42fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.kt
View file

@ -473,7 +473,7 @@ class MedtronicHistoryData @Inject constructor(
for (bolus in entryList) { for (bolus in entryList) {
val bolusDTO = bolus.decodedData["Object"] as BolusDTO val bolusDTO = bolus.decodedData["Object"] as BolusDTO
var type: DetailedBolusInfo.BolusType? = DetailedBolusInfo.BolusType.NORMAL var type: DetailedBolusInfo.BolusType = DetailedBolusInfo.BolusType.NORMAL
var multiwave = false var multiwave = false
if (bolusDTO.bolusType == PumpBolusType.Extended) { if (bolusDTO.bolusType == PumpBolusType.Extended) {
@ -500,7 +500,7 @@ class MedtronicHistoryData @Inject constructor(
temporaryId = entryWithTempId.temporaryId temporaryId = entryWithTempId.temporaryId
pumpSyncStorage.removeBolusWithTemporaryId(temporaryId) pumpSyncStorage.removeBolusWithTemporaryId(temporaryId)
boluses.remove(entryWithTempId) boluses.remove(entryWithTempId)
type = entryWithTempId.bolusData?.bolusType type = entryWithTempId.bolusData!!.bolusType
} }
} }