From 759154e578420046aa6973a4168aa157f75bae7f Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Mon, 24 Jul 2017 01:58:23 +0200
Subject: [PATCH] nsclient profile local

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d667029085..be292d21c4 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_PROFILE" />
                 <action android:name="info.nightscout.client.NEW_STATUS" />
                 <action android:name="info.nightscout.client.NEW_MBG" />
                 <action android:name="info.nightscout.client.NEW_DEVICESTATUS" />
diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.java b/app/src/main/java/info/nightscout/androidaps/MainApp.java
index e471252635..8f68a70a11 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainApp.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainApp.java
@@ -173,6 +173,8 @@ public class MainApp extends Application {
         lbm.registerReceiver(dataReceiver, new IntentFilter(Intents.ACTION_CHANGED_TREATMENT));
         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));
+
 
     }
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java
index ec62ccbf6f..e910c54205 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastProfile.java
@@ -4,12 +4,14 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
+import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.Services.Intents;
 import info.nightscout.androidaps.data.ProfileStore;
 import info.nightscout.utils.SP;
@@ -23,15 +25,23 @@ public class BroadcastProfile {
 
     public static void handleNewTreatment(ProfileStore profile, Context context, boolean isDelta) {
 
-        if(!SP.getBoolean("nsclient_localbroadcasts", true)) return;
-
         Bundle bundle = new Bundle();
         bundle.putString("profile", profile.getData().toString());
         bundle.putBoolean("delta", isDelta);
         Intent intent = new Intent(Intents.ACTION_NEW_PROFILE);
         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();
+            bundle.putString("profile", profile.getData().toString());
+            bundle.putBoolean("delta", isDelta);
+            intent = new Intent(Intents.ACTION_NEW_PROFILE);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            context.sendBroadcast(intent);
+        }
     }
 
 }