From 9798c9b47a6fe7dd13314b05a2298681a4965945 Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Tue, 29 Oct 2019 22:23:23 +0100 Subject: [PATCH 1/2] public cton on NetworkChangeReceiver --- .../androidaps/receivers/NetworkChangeReceiver.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java index 23e826e380..3f12d75fce 100644 --- a/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java +++ b/app/src/main/java/info/nightscout/androidaps/receivers/NetworkChangeReceiver.java @@ -28,11 +28,7 @@ public class NetworkChangeReceiver extends BroadcastReceiver { // TODO: Split NSClient into network state component that can be used by several plugins and logic for plugin public static void fetch() { - NetworkChangeReceiver.instance.grabNetworkStatus(MainApp.instance().getApplicationContext()); - } - - private NetworkChangeReceiver() { - super(); + new NetworkChangeReceiver().grabNetworkStatus(MainApp.instance().getApplicationContext()); } @Override @@ -90,4 +86,4 @@ public class NetworkChangeReceiver extends BroadcastReceiver { public static EventNetworkChange getLastEvent() { return lastEvent; } -} \ No newline at end of file +} From 7189115c3e42cccd4d6eb2dbd867e6ef243012ea Mon Sep 17 00:00:00 2001 From: AdrianLxM Date: Tue, 29 Oct 2019 22:25:02 +0100 Subject: [PATCH 2/2] no more singletons - what is heap space if we can have tasty side effects --- .../plugins/general/nsclient/NsClientReceiverDelegate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java index 0efbf35545..c68750d828 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NsClientReceiverDelegate.java @@ -20,7 +20,7 @@ class NsClientReceiverDelegate { private final Context context; - private NetworkChangeReceiver networkChangeReceiver = NetworkChangeReceiver.instance; + private NetworkChangeReceiver networkChangeReceiver = new NetworkChangeReceiver(); private ChargingStateReceiver chargingStateReceiver = new ChargingStateReceiver(); private boolean allowedChargingState = true;