From 82b99e1708eb32ac4dc4ca47b5f2a8050e20af67 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Mon, 24 Jul 2017 02:00:46 +0200
Subject: [PATCH] nsclient status local

---
 app/src/main/AndroidManifest.xml              |  1 -
 .../info/nightscout/androidaps/MainApp.java   |  2 ++
 .../broadcasts/BroadcastStatus.java           | 23 ++++++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index be292d21c4..fa3e1501e1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,7 +57,6 @@
             android:exported="true">
             <intent-filter>
                 <!-- Receiver from NSClient -->
-                <action android:name="info.nightscout.client.NEW_STATUS" />
                 <action android:name="info.nightscout.client.NEW_MBG" />
                 <action android:name="info.nightscout.client.NEW_DEVICESTATUS" />
                 <action android:name="info.nightscout.client.NEW_CAL" />
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index 8f68a70a11..7e7d0ea030 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -174,6 +174,8 @@ public class MainApp extends Application {
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_REMOVED_TREATMENT));
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_SGV));
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_PROFILE));
+        lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_NEW_STATUS));
+
 
 
     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
index 026658afc0..965b24073f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastStatus.java
@@ -5,6 +5,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,8 +26,6 @@ public class BroadcastStatus {
 
     public static void handleNewStatus(NSSettingsStatus status, Context context, boolean isDelta) {
 
-        if(!SP.getBoolean("nsclient_localbroadcasts", true)) return;
-
         Bundle bundle = new Bundle();
         try {
             bundle.putString("nsclientversionname", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionName);
@@ -41,6 +40,24 @@ public class BroadcastStatus {
         Intent intent = new Intent(Intents.ACTION_NEW_STATUS);
         intent.putExtras(bundle);
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        context.sendBroadcast(intent);
+        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
+
+        if(SP.getBoolean("nsclient_localbroadcasts", true)) {
+            bundle = new Bundle();
+            try {
+                bundle.putString("nsclientversionname", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionName);
+                bundle.putInt("nsclientversioncode", MainApp.instance().getPackageManager().getPackageInfo(MainApp.instance().getPackageName(), 0).versionCode);
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
+            bundle.putString("nightscoutversionname", NSClientService.nightscoutVersionName);
+            bundle.putInt("nightscoutversioncode", NSClientService.nightscoutVersionCode);
+            bundle.putString("status", status.getData().toString());
+            bundle.putBoolean("delta", isDelta);
+            intent = new Intent(Intents.ACTION_NEW_STATUS);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            context.sendBroadcast(intent);
+        }
     }
 }