caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

0.11.1-SNAPSHOT

Browse source 
- fix to suspend code
This commit is contained in:
Andy Rozman 2019-06-18 21:37:21 +01:00
parent c460d1d3ef
commit 654b8ab0f6
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -105,7 +105,7 @@ android {
multiDexEnabled true multiDexEnabled true
versionCode 1500 versionCode 1500
// dev_version: 2.3.1-dev // dev_version: 2.3.1-dev
version "medtronic-0.11.0-SNAPSHOT" version "medtronic-0.11.1-SNAPSHOT"
buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "VERSION", '"' + version + '"'
buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"' buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"' buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'

8
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/MedtronicHistoryData.java
View file

@ -869,7 +869,7 @@ public class MedtronicHistoryData {
PumpHistoryEntry oneMoreEntryFromHistory = getOneMoreEntryFromHistory(); PumpHistoryEntry oneMoreEntryFromHistory = getOneMoreEntryFromHistory();
if (oneMoreEntryFromHistory != null) { if (oneMoreEntryFromHistory != null) {
filteredItems.add(getOneMoreEntryFromHistory()); filteredItems.add(oneMoreEntryFromHistory);
} else { } else {
filteredItems.remove(filteredItems.size() - 1); // remove last (unpaired R) filteredItems.remove(filteredItems.size() - 1); // remove last (unpaired R)
} }
@ -933,6 +933,7 @@ public class MedtronicHistoryData {
if (filteredItem.getEntryType() == PumpHistoryEntryType.Bolus || if (filteredItem.getEntryType() == PumpHistoryEntryType.Bolus ||
filteredItem.getEntryType() == PumpHistoryEntryType.TempBasalCombined) { filteredItem.getEntryType() == PumpHistoryEntryType.TempBasalCombined) {
finishedItems = true; finishedItems = true;
break;
} }
if (!finishedItems) { if (!finishedItems) {
@ -956,6 +957,7 @@ public class MedtronicHistoryData {
if (filteredItem.getEntryType() == PumpHistoryEntryType.Bolus || if (filteredItem.getEntryType() == PumpHistoryEntryType.Bolus ||
filteredItem.getEntryType() == PumpHistoryEntryType.TempBasalCombined) { filteredItem.getEntryType() == PumpHistoryEntryType.TempBasalCombined) {
finishedItems = true; finishedItems = true;
break;
} }
if (!finishedItems) { if (!finishedItems) {
@ -965,8 +967,10 @@ public class MedtronicHistoryData {
} }
if (!finishedItems) if (!finishedItems) {
showLogs("NoDeliveryRewindPrimeRecords: Not finished Items: ", gson.toJson(tempData));
return outList; return outList;
}
showLogs("NoDeliveryRewindPrimeRecords: Records to evaluate: ", gson.toJson(tempData)); showLogs("NoDeliveryRewindPrimeRecords: Records to evaluate: ", gson.toJson(tempData));