From 9f6962cee5b7cb742f89dae44bbd0c7d926c3f92 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 4 Oct 2017 18:04:34 +0200 Subject: [PATCH] serialize reload of treatments --- .../java/info/nightscout/androidaps/db/DatabaseHelper.java | 6 ++---- .../androidaps/events/EventReloadTreatmentData.java | 5 +++++ .../androidaps/plugins/Treatments/TreatmentsPlugin.java | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java index 70848cfe71..3a09cb2da4 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java +++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java @@ -663,8 +663,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { class PostRunnable implements Runnable { public void run() { log.debug("Firing EventTreatmentChange"); - MainApp.bus().post(new EventReloadTreatmentData()); - MainApp.bus().post(new EventTreatmentChange()); + MainApp.bus().post(new EventReloadTreatmentData(new EventTreatmentChange())); if (earliestDataChange != null) MainApp.bus().post(new EventNewHistoryData(earliestDataChange)); earliestDataChange = null; @@ -1365,8 +1364,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper { class PostRunnable implements Runnable { public void run() { log.debug("Firing EventExtendedBolusChange"); - MainApp.bus().post(new EventReloadTreatmentData()); - MainApp.bus().post(new EventExtendedBolusChange()); + MainApp.bus().post(new EventReloadTreatmentData(new EventExtendedBolusChange())); if (earliestDataChange != null) MainApp.bus().post(new EventNewHistoryData(earliestDataChange)); earliestDataChange = null; diff --git a/app/src/main/java/info/nightscout/androidaps/events/EventReloadTreatmentData.java b/app/src/main/java/info/nightscout/androidaps/events/EventReloadTreatmentData.java index a488a9c7a4..d4ea0d3f70 100644 --- a/app/src/main/java/info/nightscout/androidaps/events/EventReloadTreatmentData.java +++ b/app/src/main/java/info/nightscout/androidaps/events/EventReloadTreatmentData.java @@ -5,4 +5,9 @@ package info.nightscout.androidaps.events; */ public class EventReloadTreatmentData { + public Object next; + + public EventReloadTreatmentData(Object next) { + this.next = next; + } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java index c7962cabc2..52f3fcacef 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/TreatmentsPlugin.java @@ -291,6 +291,7 @@ public class TreatmentsPlugin implements PluginBase, TreatmentsInterface { initializeTreatmentData(); initializeExtendedBolusData(); updateTotalIOBTreatments(); + MainApp.bus().post(ev.next); } @Subscribe