Let event classes extend Event(UpdageGui) classes.

app/src/main/java/info/nightscout/androidaps/LoggingBus.java

@@ -1,10 +1,13 @@
 package info.nightscout.androidaps;
 
 import com.squareup.otto.Bus;
+import com.squareup.otto.DeadEvent;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import info.nightscout.androidaps.events.Event;
+
 class LoggingBus extends Bus {
     private static Logger log = LoggerFactory.getLogger(LoggingBus.class);
 
@@ -16,7 +19,16 @@ class LoggingBus extends Bus {
 
     @Override
     public void post(Object event) {
+        if (event instanceof DeadEvent) {
+            log.debug("Event has no receiver:" + ((DeadEvent) event).event + ", source: " + ((DeadEvent) event).source);
+            return;
+        }
+
+        if (!(event instanceof Event)) {
+            log.error("Posted event not an event class: " + event.getClass());
+        }
+
         log.debug("Event posted: " + event);
-        super.post(event);
+        delegate.post(event);
     }
 }

app/src/main/java/info/nightscout/androidaps/events/Event.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.events;
 
 import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
 
-abstract class Event {
+public abstract class Event {
     @Override
     public String toString() {
         return ReflectionToStringBuilder.toString(this);

app/src/main/java/info/nightscout/androidaps/events/EventAppExit.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 07.07.2016.
  */
-public class EventAppExit {
+public class EventAppExit extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventBolusRequested.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.events;
  * Created by adrian on 07/02/17.
  */
 
-public class EventBolusRequested {
+public class EventBolusRequested extends Event {
     private double amount;
 
     public EventBolusRequested (double amount){

app/src/main/java/info/nightscout/androidaps/events/EventCareportalEventChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 25.05.2017.
  */
 
-public class EventCareportalEventChange {
+public class EventCareportalEventChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventConfigBuilderChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 17.02.2017.
  */
 
-public class EventConfigBuilderChange {
+public class EventConfigBuilderChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventExtendedBolusChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 15.05.2017.
  */
 
-public class EventExtendedBolusChange {
+public class EventExtendedBolusChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventFoodDatabaseChanged.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 20.09.2017.
  */
 
-public class EventFoodDatabaseChanged {
+public class EventFoodDatabaseChanged extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventInitializationChanged.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 13.12.2016.
  */
 
-public class EventInitializationChanged {
+public class EventInitializationChanged extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventNewBG.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 05.06.2016.
  */
-public class EventNewBG {
+public class EventNewBG extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventNewBasalProfile.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 04.06.2016.
  */
-public class EventNewBasalProfile {
+public class EventNewBasalProfile extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventPreferenceChange.java

@@ -5,7 +5,7 @@ import info.nightscout.androidaps.MainApp;
 /**
  * Created by mike on 19.06.2016.
  */
-public class EventPreferenceChange {
+public class EventPreferenceChange extends Event {
     public String changedKey;
     public EventPreferenceChange(String key) {
         changedKey = key;

app/src/main/java/info/nightscout/androidaps/events/EventProfileSwitchChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 02.06.2017.
  */
 
-public class EventProfileSwitchChange {
+public class EventProfileSwitchChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventPumpStatusChanged.java

@@ -7,7 +7,7 @@ import info.nightscout.androidaps.R;
  * Created by mike on 19.02.2017.
  */
 
-public class EventPumpStatusChanged {
+public class EventPumpStatusChanged extends Event {
     public static final int CONNECTING = 0;
     public static final int CONNECTED = 1;
     public static final int PERFORMING = 2;

app/src/main/java/info/nightscout/androidaps/events/EventRefreshGui.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 13.06.2016.
  */
-public class EventRefreshGui {
+public class EventRefreshGui extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventRefreshOverview.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.events;
  * Created by mike on 16.06.2017.
  */
 
-public class EventRefreshOverview {
+public class EventRefreshOverview extends Event {
     public String from;
 
     public EventRefreshOverview(String from) {

app/src/main/java/info/nightscout/androidaps/events/EventReloadProfileSwitchData.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 12.06.2017.
  */
 
-public class EventReloadProfileSwitchData {
+public class EventReloadProfileSwitchData extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventReloadTempBasalData.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 29.05.2017.
  */
 
-public class EventReloadTempBasalData {
+public class EventReloadTempBasalData extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventReloadTreatmentData.java

@@ -4,7 +4,7 @@ package info.nightscout.androidaps.events;
  * Created by mike on 29.05.2017.
  */
 
-public class EventReloadTreatmentData {
+public class EventReloadTreatmentData extends Event {
     public Object next;
 
     public EventReloadTreatmentData(Object next) {

app/src/main/java/info/nightscout/androidaps/events/EventTempBasalChange.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 05.06.2016.
  */
-public class EventTempBasalChange {
+public class EventTempBasalChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventTempTargetChange.java

@@ -4,5 +4,5 @@ package info.nightscout.androidaps.events;
  * Created by mike on 13.01.2017.
  */
 
-public class EventTempTargetChange {
+public class EventTempTargetChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventTreatmentChange.java

@@ -3,5 +3,5 @@ package info.nightscout.androidaps.events;
 /**
  * Created by mike on 04.06.2016.
  */
-public class EventTreatmentChange {
+public class EventTreatmentChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/events/EventUpdateGui.java

@@ -0,0 +1,4 @@
+package info.nightscout.androidaps.events;
+
+public abstract class EventUpdateGui extends Event {
+}

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/events/EventAutosensCalculationFinished.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.IobCobCalculator.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 30.04.2017.
  */
 
-public class EventAutosensCalculationFinished {
+public class EventAutosensCalculationFinished extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/IobCobCalculator/events/EventNewHistoryData.java

@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.IobCobCalculator.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 26.04.2017.
  */
 
-public class EventNewHistoryData {
+public class EventNewHistoryData extends Event {
     public long time = 0;
 
     public EventNewHistoryData(long time) {

app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventLoopSetLastRunGui.java

@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.Loop.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventLoopSetLastRunGui {
+public class EventLoopSetLastRunGui extends EventUpdateGui {
     public String text = null;
 
     public EventLoopSetLastRunGui(String text) {

app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventLoopUpdateGui.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.Loop.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventLoopUpdateGui {
+public class EventLoopUpdateGui extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/Loop/events/EventNewOpenLoopNotification.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.Loop.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 07.08.2016.
  */
-public class EventNewOpenLoopNotification {
+public class EventNewOpenLoopNotification extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSAddAck.java

@@ -7,14 +7,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientRestart;
-import info.nightscout.androidaps.plugins.NSClientInternal.services.NSClientService;
 import io.socket.client.Ack;
 
 /**
  * Created by mike on 29.12.2015.
  */
-public class NSAddAck implements Ack {
+public class NSAddAck extends Event implements Ack {
     private static Logger log = LoggerFactory.getLogger(NSAddAck.class);
     public String _id = null;
     public String nsClientID = null;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSAuthAck.java

@@ -3,13 +3,14 @@ package info.nightscout.androidaps.plugins.NSClientInternal.acks;
 import org.json.JSONObject;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.plugins.NSClientInternal.events.EventNSClientNewLog;
 import io.socket.client.Ack;
 
 /**
  * Created by mike on 02.01.2016.
  */
-public class NSAuthAck implements Ack{
+public class NSAuthAck extends Event implements Ack{
     public boolean read = false;
     public boolean write = false;
     public boolean write_treatment = false;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/acks/NSUpdateAck.java

@@ -6,12 +6,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.events.Event;
 import io.socket.client.Ack;
 
 /**
  * Created by mike on 21.02.2016.
  */
-public class NSUpdateAck implements Ack {
+public class NSUpdateAck extends Event implements Ack {
     private static Logger log = LoggerFactory.getLogger(NSUpdateAck.class);
     public boolean result = false;
     public String _id = null;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/events/EventNSClientNewLog.java

@@ -1,19 +1,15 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.events;
 
-import android.text.Html;
-import android.text.Spanned;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 15.02.2017.
  */
 
-public class EventNSClientNewLog {
+public class EventNSClientNewLog extends Event {
     public Date date = new Date();
     public String action;
     public String logText;

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/events/EventNSClientRestart.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 15.02.2017.
  */
 
-public class EventNSClientRestart {
+public class EventNSClientRestart extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/events/EventNSClientStatus.java

@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 02.01.2016.
  */
-public class EventNSClientStatus {
+public class EventNSClientStatus extends Event {
     public String status = "";
 
     public EventNSClientStatus(String status) {

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/events/EventNSClientUpdateGUI.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.NSClientInternal.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 17.02.2017.
  */
 
-public class EventNSClientUpdateGUI {
+public class EventNSClientUpdateGUI extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/events/EventOpenAPSUpdateGui.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.OpenAPSMA.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventOpenAPSUpdateGui {
+public class EventOpenAPSUpdateGui extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/events/EventOpenAPSUpdateResultGui.java

@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.OpenAPSMA.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventOpenAPSUpdateResultGui {
+public class EventOpenAPSUpdateResultGui extends EventUpdateGui {
     public String text = null;
 
     public EventOpenAPSUpdateResultGui(String text) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventDismissBolusprogressIfRunning.java

@@ -1,12 +1,13 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
 import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.events.Event;
 
 /**
  * Created by adrian on 20/02/17.
  */
 
-public class EventDismissBolusprogressIfRunning {
+public class EventDismissBolusprogressIfRunning extends Event {
     public final PumpEnactResult result;
 
     public EventDismissBolusprogressIfRunning(PumpEnactResult result) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventDismissNotification.java

@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 03.12.2016.
  */
 
-public class EventDismissNotification {
+public class EventDismissNotification extends Event {
     public int id;
 
     public EventDismissNotification(int did) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventNewNotification.java

@@ -1,12 +1,13 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
+import info.nightscout.androidaps.events.Event;
 import info.nightscout.androidaps.plugins.Overview.Notification;
 
 /**
  * Created by mike on 03.12.2016.
  */
 
-public class EventNewNotification {
+public class EventNewNotification extends Event {
     public Notification notification;
 
     public EventNewNotification(Notification n) {

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventOverviewBolusProgress.java

@@ -4,8 +4,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import info.nightscout.androidaps.db.Treatment;
+import info.nightscout.androidaps.events.Event;
 
-public class EventOverviewBolusProgress {
+public class EventOverviewBolusProgress extends Event {
     private static Logger log = LoggerFactory.getLogger(EventOverviewBolusProgress.class);
     public String status = "";
     public Treatment t = null;

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventQuickWizardChange.java

@@ -1,8 +1,10 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 20.10.2016.
  */
 
-public class EventQuickWizardChange {
+public class EventQuickWizardChange extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/Overview/events/EventSetWakeLock.java

@@ -1,10 +1,12 @@
 package info.nightscout.androidaps.plugins.Overview.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 02.07.2017.
  */
 
-public class EventSetWakeLock {
+public class EventSetWakeLock extends Event {
     public boolean lock = false;
 
     public EventSetWakeLock(boolean val) {

app/src/main/java/info/nightscout/androidaps/plugins/ProfileNS/events/EventNSProfileUpdateGUI.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.ProfileNS.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventNSProfileUpdateGUI {
+public class EventNSProfileUpdateGUI extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRBolusStart.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 03.08.2016.
  */
-public class EventDanaRBolusStart {
+public class EventDanaRBolusStart extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRNewStatus.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 08.07.2016.
  */
-public class EventDanaRNewStatus {
+public class EventDanaRNewStatus extends Event {
 }

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/events/EventDanaRSyncStatus.java

@@ -1,9 +1,11 @@
 package info.nightscout.androidaps.plugins.PumpDanaR.events;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 20.07.2016.
  */
-public class EventDanaRSyncStatus {
+public class EventDanaRSyncStatus extends Event {
     public String message;
 
     public EventDanaRSyncStatus() {

app/src/main/java/info/nightscout/androidaps/plugins/PumpVirtual/events/EventVirtualPumpUpdateGui.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.PumpVirtual.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventVirtualPumpUpdateGui {
+public class EventVirtualPumpUpdateGui extends EventUpdateGui {
 }

app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/events/EventNewSMS.java

@@ -2,10 +2,12 @@ package info.nightscout.androidaps.plugins.SmsCommunicator.events;
 
 import android.os.Bundle;
 
+import info.nightscout.androidaps.events.Event;
+
 /**
  * Created by mike on 13.07.2016.
  */
-public class EventNewSMS {
+public class EventNewSMS extends Event {
     public Bundle bundle;
     public EventNewSMS(Bundle bundle) {
         this.bundle = bundle;

app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/events/EventSmsCommunicatorUpdateGui.java

@@ -1,7 +1,9 @@
 package info.nightscout.androidaps.plugins.SmsCommunicator.events;
 
+import info.nightscout.androidaps.events.EventUpdateGui;
+
 /**
  * Created by mike on 05.08.2016.
  */
-public class EventSmsCommunicatorUpdateGui {
+public class EventSmsCommunicatorUpdateGui extends EventUpdateGui {
 }