caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fix clash comming from RS history

Browse source
This commit is contained in:
Milos Kozak 2020-07-01 20:54:49 +02:00
parent d66d362aa3
commit a08c1d5269
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/info/nightscout/androidaps/plugins/treatments/TreatmentService.java
View file

@ -308,6 +308,9 @@ public class TreatmentService extends OrmLiteBaseService<DatabaseHelper> {
//preserve carbs //preserve carbs
if (existingTreatment.isValid && existingTreatment.carbs > 0 && treatment.carbs == 0) { if (existingTreatment.isValid && existingTreatment.carbs > 0 && treatment.carbs == 0) {
treatment.carbs = existingTreatment.carbs; treatment.carbs = existingTreatment.carbs;
// preserve insulin
} else if (existingTreatment.isValid && existingTreatment.insulin > 0 && treatment.insulin == 0) {
treatment.insulin = existingTreatment.insulin;
} }
getDao().delete(existingTreatment); // need to delete/create because date may change too getDao().delete(existingTreatment); // need to delete/create because date may change too

3
danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
View file

@ -58,8 +58,7 @@ class DanaRSPlugin @Inject constructor(
private val danaPump: DanaPump, private val danaPump: DanaPump,
private val detailedBolusInfoStorage: DetailedBolusInfoStorage, private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
private val fabricPrivacy: FabricPrivacy, private val fabricPrivacy: FabricPrivacy,
private val dateUtil: DateUtil, private val dateUtil: DateUtil
private val config: ConfigInterface
) : PumpPluginBase(PluginDescription() ) : PumpPluginBase(PluginDescription()
.mainType(PluginType.PUMP) .mainType(PluginType.PUMP)
.fragmentClass(info.nightscout.androidaps.dana.DanaFragment::class.java.name) .fragmentClass(info.nightscout.androidaps.dana.DanaFragment::class.java.name)