From 51b01a09931d6ae33de710b6482468dfafd1d9fa Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 30 Jun 2017 10:57:29 +0200
Subject: [PATCH] split device statuses too before broadcast

---
 .../broadcasts/BroadcastDeviceStatus.java     | 21 +++++++++++--------
 .../broadcasts/BroadcastTreatment.java        |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java
index f527892378..15d8fe5b5d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java
@@ -31,15 +31,18 @@ public class BroadcastDeviceStatus {
         log.debug("DEVICESTATUS " + x.size() + " receivers");
     }
     public static void handleNewDeviceStatus(JSONArray statuses, Context context, boolean isDelta) {
-        Bundle bundle = new Bundle();
-        bundle.putString("devicestatuses", statuses.toString());
-        bundle.putBoolean("delta", isDelta);
-        Intent intent = new Intent(Intents.ACTION_NEW_DEVICESTATUS);
-        intent.putExtras(bundle);
-        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        context.sendBroadcast(intent);
-        List<ResolveInfo> x = context.getPackageManager().queryBroadcastReceivers(intent, 0);
+        List<JSONArray> splitted = BroadcastTreatment.splitArray(statuses);
+        for (JSONArray part: splitted) {
+            Bundle bundle = new Bundle();
+            bundle.putString("devicestatuses", part.toString());
+            bundle.putBoolean("delta", isDelta);
+            Intent intent = new Intent(Intents.ACTION_NEW_DEVICESTATUS);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            context.sendBroadcast(intent);
+            List<ResolveInfo> x = context.getPackageManager().queryBroadcastReceivers(intent, 0);
 
-        log.debug("DEVICESTATUS " + x.size() + " receivers");
+            log.debug("DEVICESTATUS " + part.length() + " records " + x.size() + " receivers");
+        }
     }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
index 3b76d5742b..382d8734dd 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastTreatment.java
@@ -114,7 +114,7 @@ public class BroadcastTreatment {
     }
 
 
-    private static List<JSONArray> splitArray(JSONArray array) {
+    public static List<JSONArray> splitArray(JSONArray array) {
         List<JSONArray> ret = new ArrayList<>();
         try {
             int size = array.length();