From 31ef600d6592899172e29a85c2a56058a307cd09 Mon Sep 17 00:00:00 2001
From: Jan <jan.rycko@gmail.com>
Date: Sun, 28 Jul 2024 01:38:28 +0200
Subject: [PATCH 1/8] Handling Temp Basal events in NightscoutTreatments. WIP -
 as we don't have NS profile yet.

---
 .../utilitymodels/NightscoutTreatments.java   | 58 +++++++++++++++++--
 1 file changed, 54 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
index 643bfc08da..5dbb51ce3c 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
@@ -1,18 +1,22 @@
 package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.Home;
+import com.eveningoutpost.dexdrip.NewDataObserver;
 import com.eveningoutpost.dexdrip.models.BloodTest;
 import com.eveningoutpost.dexdrip.models.DateUtil;
 import com.eveningoutpost.dexdrip.models.InsulinInjection;
 import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.models.Treatments;
 import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.models.APStatus;
 
+import org.checkerframework.checker.units.qual.A;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.UUID;
 
@@ -22,7 +26,7 @@
 
 public class NightscoutTreatments {
 
-    private static final boolean d = false;
+    private static final boolean d = true;
     private static final String TAG = "NightscoutTreatments";
 
     private static final HashSet<String> bad_uuids = new HashSet<>();
@@ -32,6 +36,7 @@ public static boolean processTreatmentResponse(final String response) throws Exc
         boolean new_data = false;
 
         final JSONArray jsonArray = new JSONArray(response);
+        ArrayList<APStatusEntry> statusEntries = new ArrayList<APStatusEntry>();
         for (int i = 0; i < jsonArray.length(); i++) {
             final JSONObject tr = (JSONObject) jsonArray.get(i);
 
@@ -44,7 +49,7 @@ public static boolean processTreatmentResponse(final String response) throws Exc
                 continue;
             }
             if (d)
-                UserError.Log.d(TAG, "event: " + etype + "_id: " + nightscout_id + " uuid:" + uuid);
+                UserError.Log.d(TAG, "event: " + etype + " _id: " + nightscout_id + " uuid: " + uuid);
 
             boolean from_xdrip = false;
             try {
@@ -99,6 +104,7 @@ public static boolean processTreatmentResponse(final String response) throws Exc
             // extract treatment data if present
             double carbs = 0;
             double insulin = 0;
+            Double absolute = null;
             String injections = null;
             String notes = null;
             try {
@@ -111,6 +117,11 @@ public static boolean processTreatmentResponse(final String response) throws Exc
             } catch (JSONException e) {
                 // Log.d(TAG, "json processing: " + e);
             }
+            try {
+                absolute = tr.has("absolute") ? tr.getDouble("absolute") : null;
+            } catch (JSONException e) {
+                UserError.Log.e(TAG, "Could not parse absolute: " + tr.get("absolute"));
+            }
             try {
                 injections = tr.getString("insulinInjections");
             } catch (JSONException e) {
@@ -125,11 +136,27 @@ public static boolean processTreatmentResponse(final String response) throws Exc
             if ((notes != null) && ((notes.startsWith("AndroidAPS started") || notes.equals("null") || (notes.equals("Bolus Std")))))
                 notes = null;
 
-            if ((carbs > 0) || (insulin > 0) || (notes != null)) {
+            if ((carbs > 0) || (insulin > 0) || (notes != null) || (absolute != null && etype.equals("Temp Basal"))) {
+
                 final long timestamp = DateUtil.tolerantFromISODateString(tr.getString("created_at")).getTime();
+
                 if (timestamp > 0) {
                     if (d)
-                        UserError.Log.d(TAG, "Treatment: Carbs: " + carbs + " Insulin: " + insulin + " timestamp: " + timestamp);
+                        UserError.Log.d(TAG, "Treatment: Carbs: " + carbs + " Insulin: " + insulin + " Temp basal: " + absolute + " timestamp: " + timestamp);
+
+                    if (absolute != null) {
+                        UserError.Log.ueh(TAG, "New Treatment from Nightscout: Temp Basal: " + absolute + " Event type: " + etype + " timestamp: " + JoH.dateTimeText(timestamp) + ((notes != null) ? " Note: " + notes : ""));
+
+                        if (etype.equals("Temp Basal")) {
+                            statusEntries.add(new APStatusEntry(absolute, timestamp));
+                            new_data = true;
+                        } else {
+                            UserError.Log.e(TAG, "Event type is not for Temp Basal: " + etype);
+                        }
+                    } else if (etype.equals("Temp Basal")) {
+                        UserError.Log.e(TAG, "Could not parse rate: " + tr.getDouble("rate"));
+                    }
+
                     Treatments existing = Treatments.byuuid(nightscout_id);
                     if (existing == null)
                         existing = Treatments.byuuid(uuid);
@@ -205,6 +232,29 @@ public static boolean processTreatmentResponse(final String response) throws Exc
                 }
             }
         }
+
+        statusEntries.sort(APStatusEntry::compare);
+
+        statusEntries.forEach(entry -> {
+            int temporaryPercentWithoutProfile = (int) (entry.absolute * 100 / 0.15);
+            APStatus.createEfficientRecord(entry.timestamp, temporaryPercentWithoutProfile, entry.absolute);
+            NewDataObserver.newExternalStatus(false);
+        });
+
         return new_data;
     }
 }
+
+class APStatusEntry {
+    double absolute;
+    long timestamp;
+
+    public APStatusEntry(double absolute, long timestamp) {
+        this.absolute = absolute;
+        this.timestamp = timestamp;
+    }
+
+    public static int compare(APStatusEntry a, APStatusEntry b) {
+        return (int) (a.timestamp - b.timestamp);
+    }
+}
\ No newline at end of file

From 0ef380ec4c98e8b25782756375367bc527c87af2 Mon Sep 17 00:00:00 2001
From: Jan <jan.rycko@gmail.com>
Date: Sun, 28 Jul 2024 19:54:59 +0200
Subject: [PATCH 2/8] =?UTF-8?q?Working=20profile=20loading=20from=20Nights?=
 =?UTF-8?q?cout.=20Not=20working=20yet=20=E2=80=93=20showing=20it=20in=20t?=
 =?UTF-8?q?he=20view.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cgm/nsfollow/NightscoutFollow.java        | 33 ++++++++++
 .../cgm/nsfollow/NightscoutFollowService.java |  2 +-
 .../dexdrip/cgm/nsfollow/Session.java         |  8 +++
 .../nsfollow/messages/BasalProfileEntry.java  | 20 +++++++
 .../cgm/nsfollow/messages/Profile.java        | 60 +++++++++++++++++++
 .../cgm/nsfollow/messages/SingleProfile.java  | 10 ++++
 .../utilitymodels/NightscoutTreatments.java   | 24 +++-----
 app/src/main/res/values/strings.xml           |  2 +
 app/src/main/res/xml/pref_data_source.xml     |  7 ++-
 9 files changed, 148 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/BasalProfileEntry.java
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Profile.java
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/SingleProfile.java

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
index eb3944db37..82256531e1 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
@@ -1,8 +1,10 @@
 package com.eveningoutpost.dexdrip.cgm.nsfollow;
 
 import com.eveningoutpost.dexdrip.BuildConfig;
+import com.eveningoutpost.dexdrip.cgm.nsfollow.messages.Profile;
 import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.models.UserError;
+import com.eveningoutpost.dexdrip.profileeditor.BasalProfile;
 import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
 import com.eveningoutpost.dexdrip.utilitymodels.Constants;
 import com.eveningoutpost.dexdrip.utilitymodels.NightscoutTreatments;
@@ -36,6 +38,7 @@
 import retrofit2.http.Query;
 
 import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
+import static com.eveningoutpost.dexdrip.profileeditor.BasalProfile.consolidate;
 import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 import static com.eveningoutpost.dexdrip.utilitymodels.OkHttpWrapper.enableTls12OnPreLollipop;
 import static com.eveningoutpost.dexdrip.cgm.nsfollow.NightscoutFollowService.msg;
@@ -66,6 +69,9 @@ public interface Nightscout {
 
         @GET("/api/v1/treatments")
         Call<ResponseBody> getTreatments(@Header("api-secret") String secret);
+
+        @GET("/api/v1/profile")
+        Call<List<Profile>> getProfiles(@Header("api-secret") String secret);
     }
 
     private static Nightscout getService() {
@@ -109,6 +115,17 @@ public static void work(final boolean live) {
         })
                 .setOnFailure(() -> msg(session.treatmentsCallback.getStatus()));
 
+        // set up processing callback for profiles
+        session.profilesCallback = new NightscoutCallback<List<Profile>>("NS profiles download", session, () -> {
+            // process data
+            try {
+                BasalProfile.save(BasalProfile.getActiveRateName(), session.currentProfile.getDefaultBasalProfile());
+            } catch (Exception e) {
+                msg("Profile: " + e);
+            }
+        })
+                .setOnFailure(() -> msg(session.profilesCallback.getStatus()));
+
         if (!emptyString(urlString)) {
             try {
                 int count = Math.min(MissedReadingsEstimator.estimate() + 1, (int) (Constants.DAY_IN_MS / DEXCOM_PERIOD));
@@ -119,6 +136,18 @@ public static void work(final boolean live) {
                 UserError.Log.e(TAG, "Exception in entries work() " + e);
                 msg("Nightscout follow entries error: " + e);
             }
+
+            if (profileDownloadEnabled()) {
+                if (JoH.ratelimit("nsfollow-profile-download", 60)) {
+                    try {
+                        getService().getProfiles(session.url.getHashedSecret()).enqueue(session.profilesCallback);
+                    } catch (Exception e) {
+                        UserError.Log.e(TAG, "Exception in profiles work() " + e);
+                        msg("Nightscout follow profiles error: " + e);
+                    }
+                }
+            }
+
             if (treatmentDownloadEnabled()) {
                 if (JoH.ratelimit("nsfollow-treatment-download", 60)) {
                     try {
@@ -142,6 +171,10 @@ static boolean treatmentDownloadEnabled() {
         return Pref.getBooleanDefaultFalse("nsfollow_download_treatments");
     }
 
+    static boolean profileDownloadEnabled() {
+        return Pref.getBoolean("nsfollow_download_profile", true);
+    }
+
     public static final TypeAdapter<Number> UNRELIABLE_INTEGER = new TypeAdapter<Number>() {
         @Override
         public Number read(JsonReader in) throws IOException {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
index 720182618b..e0dfcc160b 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
@@ -44,7 +44,7 @@
 public class NightscoutFollowService extends ForegroundService {
 
     private static final String TAG = "NightscoutFollow";
-    private static final long SAMPLE_PERIOD = DEXCOM_PERIOD;
+    private static final long SAMPLE_PERIOD = 60_000;
 
     protected static volatile String lastState = "";
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/Session.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/Session.java
index 0839430cef..b15b645f97 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/Session.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/Session.java
@@ -1,6 +1,7 @@
 package com.eveningoutpost.dexdrip.cgm.nsfollow;
 
 import com.eveningoutpost.dexdrip.cgm.nsfollow.messages.Entry;
+import com.eveningoutpost.dexdrip.cgm.nsfollow.messages.Profile;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.utils.NightscoutUrl;
 
 import java.util.List;
@@ -20,12 +21,14 @@ public class Session {
     public NightscoutUrl url;
     public BaseCallback<List<Entry>> entriesCallback;
     public BaseCallback<ResponseBody> treatmentsCallback;
+    public BaseCallback<List<Profile>> profilesCallback;
 
 
     // most recent set of entries
     public List<Entry> entries;
     // most recent treatments raw json
     public ResponseBody treatments;
+    public Profile currentProfile;
 
 
     // populate session data from a response object which could be any supported type
@@ -36,6 +39,11 @@ public void populate(final Object object) {
             if (!someList.isEmpty() && someList.get(0) instanceof Entry) {
                 entries = (List<Entry>)object;
             }
+            if (!someList.isEmpty() && someList.get(0) instanceof Profile) {
+                List<Profile> list = (List<Profile>)object;
+                list.sort(Profile::compare);
+                currentProfile = list.get(0);
+            }
 
         } else if (object instanceof ResponseBody) {
             treatments = (ResponseBody)object;
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/BasalProfileEntry.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/BasalProfileEntry.java
new file mode 100644
index 0000000000..39c0f08466
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/BasalProfileEntry.java
@@ -0,0 +1,20 @@
+package com.eveningoutpost.dexdrip.cgm.nsfollow.messages;
+
+import com.google.gson.annotations.Expose;
+
+import java.util.Locale;
+
+public class BasalProfileEntry {
+    @Expose
+    public String time; // 01:00 etc.
+    @Expose
+    public int timeAsSeconds;
+    @Expose
+    public double value;
+
+    public BasalProfileEntry(int timeAsSeconds, double value) {
+        this.timeAsSeconds = timeAsSeconds;
+        this.value = value;
+        this.time = String.format((Locale) null, "%02d:00", timeAsSeconds / 3600);
+    }
+}
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Profile.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Profile.java
new file mode 100644
index 0000000000..5f67e5e005
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Profile.java
@@ -0,0 +1,60 @@
+package com.eveningoutpost.dexdrip.cgm.nsfollow.messages;
+
+import com.google.gson.annotations.Expose;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Profile extends BaseMessage {
+    @Expose
+    public String _id;
+    @Expose
+    public String defaultProfile;
+    @Expose
+    public String startDate; // ISO date time
+    @Expose
+    public String created_at; // ISO date time
+    @Expose
+    public HashMap<String, SingleProfile> store;
+
+    public static int compare(Profile a, Profile b) {
+        return b.startDate.compareTo(a.startDate);
+    }
+
+    public List<Double> getDefaultBasalProfile() {
+        SingleProfile singleProfile = store.get("defaultProfile");
+
+        if (singleProfile == null) {
+            return new ArrayList<>();
+        }
+
+        ArrayList<BasalProfileEntry> profileFromNS = singleProfile.basal;
+
+        int oneHourAsSeconds = 3600;
+
+        int size = profileFromNS.size();
+
+        for (int i = 0; profileFromNS.size() >= i + 1; i++) {
+            int nextIndex = i + 1;
+
+            if (profileFromNS.size() <= nextIndex) {
+                break;
+            }
+
+            BasalProfileEntry profileEntry = profileFromNS.get(i);
+            BasalProfileEntry nextProfileEntry = profileFromNS.get(i + 1);
+
+            int nextTimeAsSeconds = profileEntry.timeAsSeconds + oneHourAsSeconds;
+
+            if (nextProfileEntry.timeAsSeconds > nextTimeAsSeconds) {
+                profileFromNS.add(nextIndex, new BasalProfileEntry(nextTimeAsSeconds, profileEntry.value));
+            }
+        }
+
+        return profileFromNS.stream().map(x -> x.value)
+                .collect(Collectors.toList());
+    }
+}
+
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/SingleProfile.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/SingleProfile.java
new file mode 100644
index 0000000000..92aa7ffadc
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/SingleProfile.java
@@ -0,0 +1,10 @@
+package com.eveningoutpost.dexdrip.cgm.nsfollow.messages;
+
+import com.google.gson.annotations.Expose;
+
+import java.util.ArrayList;
+
+public class SingleProfile {
+    @Expose
+    public ArrayList<BasalProfileEntry> basal;
+}
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
index 5dbb51ce3c..011ba8b5f3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
@@ -144,23 +144,16 @@ public static boolean processTreatmentResponse(final String response) throws Exc
                     if (d)
                         UserError.Log.d(TAG, "Treatment: Carbs: " + carbs + " Insulin: " + insulin + " Temp basal: " + absolute + " timestamp: " + timestamp);
 
-                    if (absolute != null) {
-                        UserError.Log.ueh(TAG, "New Treatment from Nightscout: Temp Basal: " + absolute + " Event type: " + etype + " timestamp: " + JoH.dateTimeText(timestamp) + ((notes != null) ? " Note: " + notes : ""));
-
-                        if (etype.equals("Temp Basal")) {
-                            statusEntries.add(new APStatusEntry(absolute, timestamp));
-                            new_data = true;
-                        } else {
-                            UserError.Log.e(TAG, "Event type is not for Temp Basal: " + etype);
-                        }
-                    } else if (etype.equals("Temp Basal")) {
-                        UserError.Log.e(TAG, "Could not parse rate: " + tr.getDouble("rate"));
-                    }
-
                     Treatments existing = Treatments.byuuid(nightscout_id);
                     if (existing == null)
                         existing = Treatments.byuuid(uuid);
-                    if ((existing == null) && !(from_xdrip && skip_from_xdrip)) {
+
+                    if (absolute != null && etype.equals("Temp Basal")) {
+                        UserError.Log.ueh(TAG, "New Treatment from Nightscout: Temp Basal: " + absolute + " Event type: " + etype + " timestamp: " + JoH.dateTimeText(timestamp) + ((notes != null) ? " Note: " + notes : ""));
+
+                        statusEntries.add(new APStatusEntry(absolute, timestamp));
+                        new_data = true;
+                    } else if ((existing == null) && !(from_xdrip && skip_from_xdrip)) {
                         // check for close timestamp duplicates perhaps
                         existing = Treatments.byTimestamp(timestamp, 60000);
                         if (!((existing != null) && (JoH.roundDouble(existing.insulin, 2) == JoH.roundDouble(insulin, 2))
@@ -236,8 +229,7 @@ public static boolean processTreatmentResponse(final String response) throws Exc
         statusEntries.sort(APStatusEntry::compare);
 
         statusEntries.forEach(entry -> {
-            int temporaryPercentWithoutProfile = (int) (entry.absolute * 100 / 0.15);
-            APStatus.createEfficientRecord(entry.timestamp, temporaryPercentWithoutProfile, entry.absolute);
+            APStatus.createEfficientRecord(entry.timestamp, entry.absolute);
             NewDataObserver.newExternalStatus(false);
         });
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c3743c9e7..ca8bc5c619 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1340,6 +1340,8 @@
     <string name="summary_nsfollow_download_treatments">Also download treatments from Nightscout as follower</string>
     <string name="title_nsfollow_download_treatments">Download Treatments</string>
     <string name="title_nsfollow_lag">Nightscout Follow delay</string>
+    <string name="summary_nsfollow_download_profile">Also download basal profile from Nightscout as follower</string>
+    <string name="title_nsfollow_download_profile">Download Basal Profile</string>
     <!-- Maybe we can use them later?
     <string name="title_clfollow_user">CareLink Username</string>
     <string name="summary_clfollow_user">CareLink login username</string>
diff --git a/app/src/main/res/xml/pref_data_source.xml b/app/src/main/res/xml/pref_data_source.xml
index 07ef37e6e7..41c2371557 100644
--- a/app/src/main/res/xml/pref_data_source.xml
+++ b/app/src/main/res/xml/pref_data_source.xml
@@ -196,7 +196,7 @@
             android:key="nsfollow_download_treatments_screen"
             android:title="@string/title_nsfollow_download_treatments">
             <CheckBoxPreference
-                android:defaultValue="false"
+                android:defaultValue="true"
                 android:key="nsfollow_download_treatments"
                 android:summary="@string/summary_nsfollow_download_treatments"
                 android:title="@string/title_nsfollow_download_treatments" />
@@ -206,6 +206,11 @@
                 android:key="cloud_storage_api_skip_download_from_xdrip"
                 android:summary="@string/summary_cloud_storage_api_download_from_xdrip"
                 android:title="@string/title_cloud_storage_api_download_from_xdrip" />
+            <CheckBoxPreference
+                android:defaultValue="true"
+                android:key="nsfollow_download_profile"
+                android:summary="@string/summary_nsfollow_download_profile"
+                android:title="@string/title_nsfollow_download_profile" />
         </PreferenceScreen>
         <ListPreference
             android:defaultValue="0"

From ba1e691056a49b5df899e72040a9c024cb81ce2c Mon Sep 17 00:00:00 2001
From: Jan <jan.rycko@gmail.com>
Date: Mon, 5 Aug 2024 20:01:00 +0200
Subject: [PATCH 3/8] Using profile to fill empty spaces in APStatus.

---
 .../cgm/nsfollow/NightscoutFollow.java        |  25 ++-
 .../cgm/nsfollow/messages/Profile.java        |   4 +-
 .../utilitymodels/NightscoutBasalRate.java    | 186 ++++++++++++++++++
 .../utilitymodels/NightscoutTreatments.java   |  52 +----
 4 files changed, 208 insertions(+), 59 deletions(-)
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
index 82256531e1..c3ca831a45 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
@@ -5,10 +5,7 @@
 import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.profileeditor.BasalProfile;
-import com.eveningoutpost.dexdrip.utilitymodels.CollectionServiceStarter;
-import com.eveningoutpost.dexdrip.utilitymodels.Constants;
-import com.eveningoutpost.dexdrip.utilitymodels.NightscoutTreatments;
-import com.eveningoutpost.dexdrip.utilitymodels.Pref;
+import com.eveningoutpost.dexdrip.utilitymodels.*;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.messages.Entry;
 import com.eveningoutpost.dexdrip.cgm.nsfollow.utils.NightscoutUrl;
 import com.eveningoutpost.dexdrip.evaluators.MissedReadingsEstimator;
@@ -38,7 +35,6 @@
 import retrofit2.http.Query;
 
 import static com.eveningoutpost.dexdrip.models.JoH.emptyString;
-import static com.eveningoutpost.dexdrip.profileeditor.BasalProfile.consolidate;
 import static com.eveningoutpost.dexdrip.utilitymodels.BgGraphBuilder.DEXCOM_PERIOD;
 import static com.eveningoutpost.dexdrip.utilitymodels.OkHttpWrapper.enableTls12OnPreLollipop;
 import static com.eveningoutpost.dexdrip.cgm.nsfollow.NightscoutFollowService.msg;
@@ -107,8 +103,14 @@ public static void work(final boolean live) {
         session.treatmentsCallback = new NightscoutCallback<ResponseBody>("NS treatments download", session, () -> {
             // process data
             try {
-                NightscoutTreatments.processTreatmentResponse(session.treatments.string());
-                NightscoutFollowService.updateTreatmentDownloaded();
+                final String response = session.treatments.string();
+
+                if (treatmentDownloadEnabled()) {
+                    NightscoutTreatments.processTreatmentResponse(response);
+                    NightscoutFollowService.updateTreatmentDownloaded();
+                }
+
+                NightscoutBasalRate.setTreatments(response);
             } catch (Exception e) {
                 msg("Treatments: " + e);
             }
@@ -119,7 +121,12 @@ public static void work(final boolean live) {
         session.profilesCallback = new NightscoutCallback<List<Profile>>("NS profiles download", session, () -> {
             // process data
             try {
-                BasalProfile.save(BasalProfile.getActiveRateName(), session.currentProfile.getDefaultBasalProfile());
+                List<Double> profile = session.currentProfile.getDefaultBasalProfile();
+
+                UserError.Log.uel(TAG, "Profile: " + profile.toString());
+
+                BasalProfile.save(BasalProfile.getActiveRateName(), profile);
+                NightscoutBasalRate.setProfile(profile);
             } catch (Exception e) {
                 msg("Profile: " + e);
             }
@@ -148,7 +155,7 @@ public static void work(final boolean live) {
                 }
             }
 
-            if (treatmentDownloadEnabled()) {
+            if (treatmentDownloadEnabled() || profileDownloadEnabled()) {
                 if (JoH.ratelimit("nsfollow-treatment-download", 60)) {
                     try {
                         getService().getTreatments(session.url.getHashedSecret()).enqueue(session.treatmentsCallback);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Profile.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Profile.java
index 5f67e5e005..76575ad039 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Profile.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/messages/Profile.java
@@ -24,7 +24,7 @@ public static int compare(Profile a, Profile b) {
     }
 
     public List<Double> getDefaultBasalProfile() {
-        SingleProfile singleProfile = store.get("defaultProfile");
+        SingleProfile singleProfile = store.get(defaultProfile);
 
         if (singleProfile == null) {
             return new ArrayList<>();
@@ -34,8 +34,6 @@ public List<Double> getDefaultBasalProfile() {
 
         int oneHourAsSeconds = 3600;
 
-        int size = profileFromNS.size();
-
         for (int i = 0; profileFromNS.size() >= i + 1; i++) {
             int nextIndex = i + 1;
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
new file mode 100644
index 0000000000..31c97e2ab9
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
@@ -0,0 +1,186 @@
+package com.eveningoutpost.dexdrip.utilitymodels;
+
+import com.eveningoutpost.dexdrip.NewDataObserver;
+import com.eveningoutpost.dexdrip.models.APStatus;
+import com.eveningoutpost.dexdrip.models.DateUtil;
+import com.eveningoutpost.dexdrip.models.JoH;
+import com.eveningoutpost.dexdrip.models.UserError;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class NightscoutBasalRate {
+    private static final boolean d = true;
+    private static final String TAG = "NightscoutBasalRate";
+    private static final int requiredSegments = 24;
+    private static final int minimumProfileBRDuration = 10000;
+
+    private static ArrayList<APStatusEntry> statusEntries = new ArrayList<>();
+    private static List<Double> profile = new ArrayList<>();
+
+    public static void setTreatments(final String response) throws Exception {
+        final JSONArray jsonArray = new JSONArray(response);
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            final JSONObject tr = (JSONObject) jsonArray.get(i);
+            final String etype = tr.has("eventType") ? tr.getString("eventType") : "<null>";
+
+            if (!etype.equals("Temp Basal")) {
+                continue;
+            }
+
+            Double absolute = null;
+            Long durationInMilliseconds = null;
+
+            try {
+                absolute = tr.has("absolute") ? tr.getDouble("absolute") : null;
+            } catch (JSONException e) {
+                UserError.Log.e(TAG, "Could not parse absolute: " + tr.get("absolute"));
+            }
+
+            try {
+                durationInMilliseconds = tr.has("durationInMilliseconds") ? tr.getLong("durationInMilliseconds") : null;
+            } catch (JSONException e) {
+                UserError.Log.e(TAG, "Could not parse durationInMilliseconds: " + tr.get("durationInMilliseconds"));
+            }
+
+            if (absolute != null && durationInMilliseconds != null) {
+                final long timestamp = DateUtil.tolerantFromISODateString(tr.getString("created_at")).getTime();
+
+                if (d) {
+                    UserError.Log.ueh(TAG, "New Treatment from Nightscout: Temp Basal: " + absolute + " Event type: " + etype + " timestamp: " + JoH.dateTimeText(timestamp));
+                }
+
+                statusEntries.add(new APStatusEntry(absolute, timestamp, durationInMilliseconds, false));
+            }
+        }
+
+        tryProcessBasalRate();
+    }
+
+    public static void setProfile(List<Double> loadedProfile) {
+        profile = loadedProfile;
+
+        tryProcessBasalRate();
+    }
+
+    public static void tryProcessBasalRate() {
+        if (statusEntries.isEmpty() || profile.isEmpty()) {
+            if (d) {
+                UserError.Log.ueh(TAG, "Trying to process Nightscout basal rate, but:" + (statusEntries.isEmpty() ? " - treatments are still empty" : "") + (profile.isEmpty() ? " - profile is still empty" : ""));
+            }
+            return;
+        }
+
+        long nowInMilliseconds = System.currentTimeMillis();
+
+        if (d) {
+            UserError.Log.ueh(TAG, "Process Nightscout basal rate with " + statusEntries.size() + " new tbr entries and " + profile.size() + " profile segments.");
+        }
+
+        statusEntries.sort(APStatusEntry::compare);
+
+        for (int i = 0; statusEntries.size() >= i + 1; i++) {
+            int nextIndex = i + 1;
+
+            boolean hasNext = nextIndex < statusEntries.size();
+
+            APStatusEntry currentEntry = statusEntries.get(i);
+            APStatusEntry nextEntry = hasNext ? statusEntries.get(nextIndex) : null;
+
+            long currentEntryFinishTimestamp = currentEntry.timestamp + currentEntry.durationInMilliseconds;
+
+            if (currentEntryFinishTimestamp < nowInMilliseconds && (nextEntry == null || nextEntry.timestamp > currentEntryFinishTimestamp)) {
+                APStatusEntry nextSegment = getNextSegment(
+                    currentEntryFinishTimestamp,
+                    profile,
+                    Math.min(nowInMilliseconds, nextEntry != null ? nextEntry.timestamp : Long.MAX_VALUE)
+                );
+
+                if (nextSegment.durationInMilliseconds < minimumProfileBRDuration) {
+                    continue;
+                }
+
+                if (d) {
+                    UserError.Log.ueh(TAG, "Adding next profile segment: " + nextSegment.absolute + "U, timestamp: " + JoH.dateTimeText(nextSegment.timestamp) + ", duration: " + nextSegment.durationInMilliseconds + "ms");
+                }
+
+                statusEntries.add(nextIndex, nextSegment);
+            }
+        }
+
+        // TODO: Should not be needed
+        statusEntries.sort(APStatusEntry::compare);
+
+        statusEntries.forEach(entry -> {
+            APStatus.createEfficientRecord(entry.timestamp, entry.absolute);
+            NewDataObserver.newExternalStatus(false);
+        });
+
+        statusEntries = new ArrayList<>();
+        profile = new ArrayList<>();
+    }
+
+    static APStatusEntry getNextSegment(long lastFinishTimestamp, List<Double> profile, long nextTimestamp) {
+        int hour = getHourOfTheDay(lastFinishTimestamp);
+        double absolute = profile.get(hour);
+        long finishTimestamp = getHourFinishTimestamp(lastFinishTimestamp, nextTimestamp);
+
+        long duration = finishTimestamp - lastFinishTimestamp;
+
+        return new APStatusEntry(absolute, lastFinishTimestamp, duration, true);
+    }
+
+    static int getHourOfTheDay(long timestamp) {
+        Calendar calendar = Calendar.getInstance();
+
+        calendar.setTimeInMillis(timestamp);
+
+        return calendar.get(Calendar.HOUR_OF_DAY);
+    }
+
+    static long getHourFinishTimestamp(long timestamp, long nextTimestamp) {
+        Calendar calendar = Calendar.getInstance();
+
+        calendar.setTimeInMillis(timestamp);
+        calendar.add(Calendar.HOUR, 1);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+        calendar.add(Calendar.MILLISECOND, -1);
+
+        return Math.min(calendar.getTimeInMillis(), nextTimestamp);
+    }
+}
+
+class APStatusEntry {
+    double absolute;
+    long timestamp;
+    // For debugging
+    long durationInMilliseconds;
+    String timestampText;
+    String timestampEndText;
+    boolean isProfile;
+    boolean isTBR;
+
+    public APStatusEntry(double absolute, long timestamp, long durationInMilliseconds, boolean isProfile) {
+        this.absolute = absolute;
+        this.timestamp = timestamp;
+        this.durationInMilliseconds = durationInMilliseconds;
+
+        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault());
+
+        this.timestampText = df.format(new Date(timestamp));
+        this.timestampEndText = df.format(new Date(timestamp + durationInMilliseconds));
+        this.isProfile = isProfile;
+        this.isTBR = !isProfile;
+    }
+
+    public static int compare(APStatusEntry a, APStatusEntry b) {
+        return (int) (a.timestamp - b.timestamp);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
index 011ba8b5f3..643bfc08da 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutTreatments.java
@@ -1,22 +1,18 @@
 package com.eveningoutpost.dexdrip.utilitymodels;
 
 import com.eveningoutpost.dexdrip.Home;
-import com.eveningoutpost.dexdrip.NewDataObserver;
 import com.eveningoutpost.dexdrip.models.BloodTest;
 import com.eveningoutpost.dexdrip.models.DateUtil;
 import com.eveningoutpost.dexdrip.models.InsulinInjection;
 import com.eveningoutpost.dexdrip.models.JoH;
 import com.eveningoutpost.dexdrip.models.Treatments;
 import com.eveningoutpost.dexdrip.models.UserError;
-import com.eveningoutpost.dexdrip.models.APStatus;
 
-import org.checkerframework.checker.units.qual.A;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.UUID;
 
@@ -26,7 +22,7 @@
 
 public class NightscoutTreatments {
 
-    private static final boolean d = true;
+    private static final boolean d = false;
     private static final String TAG = "NightscoutTreatments";
 
     private static final HashSet<String> bad_uuids = new HashSet<>();
@@ -36,7 +32,6 @@ public static boolean processTreatmentResponse(final String response) throws Exc
         boolean new_data = false;
 
         final JSONArray jsonArray = new JSONArray(response);
-        ArrayList<APStatusEntry> statusEntries = new ArrayList<APStatusEntry>();
         for (int i = 0; i < jsonArray.length(); i++) {
             final JSONObject tr = (JSONObject) jsonArray.get(i);
 
@@ -49,7 +44,7 @@ public static boolean processTreatmentResponse(final String response) throws Exc
                 continue;
             }
             if (d)
-                UserError.Log.d(TAG, "event: " + etype + " _id: " + nightscout_id + " uuid: " + uuid);
+                UserError.Log.d(TAG, "event: " + etype + "_id: " + nightscout_id + " uuid:" + uuid);
 
             boolean from_xdrip = false;
             try {
@@ -104,7 +99,6 @@ public static boolean processTreatmentResponse(final String response) throws Exc
             // extract treatment data if present
             double carbs = 0;
             double insulin = 0;
-            Double absolute = null;
             String injections = null;
             String notes = null;
             try {
@@ -117,11 +111,6 @@ public static boolean processTreatmentResponse(final String response) throws Exc
             } catch (JSONException e) {
                 // Log.d(TAG, "json processing: " + e);
             }
-            try {
-                absolute = tr.has("absolute") ? tr.getDouble("absolute") : null;
-            } catch (JSONException e) {
-                UserError.Log.e(TAG, "Could not parse absolute: " + tr.get("absolute"));
-            }
             try {
                 injections = tr.getString("insulinInjections");
             } catch (JSONException e) {
@@ -136,24 +125,15 @@ public static boolean processTreatmentResponse(final String response) throws Exc
             if ((notes != null) && ((notes.startsWith("AndroidAPS started") || notes.equals("null") || (notes.equals("Bolus Std")))))
                 notes = null;
 
-            if ((carbs > 0) || (insulin > 0) || (notes != null) || (absolute != null && etype.equals("Temp Basal"))) {
-
+            if ((carbs > 0) || (insulin > 0) || (notes != null)) {
                 final long timestamp = DateUtil.tolerantFromISODateString(tr.getString("created_at")).getTime();
-
                 if (timestamp > 0) {
                     if (d)
-                        UserError.Log.d(TAG, "Treatment: Carbs: " + carbs + " Insulin: " + insulin + " Temp basal: " + absolute + " timestamp: " + timestamp);
-
+                        UserError.Log.d(TAG, "Treatment: Carbs: " + carbs + " Insulin: " + insulin + " timestamp: " + timestamp);
                     Treatments existing = Treatments.byuuid(nightscout_id);
                     if (existing == null)
                         existing = Treatments.byuuid(uuid);
-
-                    if (absolute != null && etype.equals("Temp Basal")) {
-                        UserError.Log.ueh(TAG, "New Treatment from Nightscout: Temp Basal: " + absolute + " Event type: " + etype + " timestamp: " + JoH.dateTimeText(timestamp) + ((notes != null) ? " Note: " + notes : ""));
-
-                        statusEntries.add(new APStatusEntry(absolute, timestamp));
-                        new_data = true;
-                    } else if ((existing == null) && !(from_xdrip && skip_from_xdrip)) {
+                    if ((existing == null) && !(from_xdrip && skip_from_xdrip)) {
                         // check for close timestamp duplicates perhaps
                         existing = Treatments.byTimestamp(timestamp, 60000);
                         if (!((existing != null) && (JoH.roundDouble(existing.insulin, 2) == JoH.roundDouble(insulin, 2))
@@ -225,28 +205,6 @@ public static boolean processTreatmentResponse(final String response) throws Exc
                 }
             }
         }
-
-        statusEntries.sort(APStatusEntry::compare);
-
-        statusEntries.forEach(entry -> {
-            APStatus.createEfficientRecord(entry.timestamp, entry.absolute);
-            NewDataObserver.newExternalStatus(false);
-        });
-
         return new_data;
     }
 }
-
-class APStatusEntry {
-    double absolute;
-    long timestamp;
-
-    public APStatusEntry(double absolute, long timestamp) {
-        this.absolute = absolute;
-        this.timestamp = timestamp;
-    }
-
-    public static int compare(APStatusEntry a, APStatusEntry b) {
-        return (int) (a.timestamp - b.timestamp);
-    }
-}
\ No newline at end of file

From 5ee3bb76a12617b87a26d632657777a81c7ffa9c Mon Sep 17 00:00:00 2001
From: Jan <jan.rycko@gmail.com>
Date: Mon, 5 Aug 2024 20:31:18 +0200
Subject: [PATCH 4/8] Options clean up.

---
 .../dexdrip/cgm/nsfollow/NightscoutFollow.java  | 12 +++++++-----
 .../cgm/nsfollow/NightscoutFollowService.java   | 17 +++++++++++------
 .../utilitymodels/NightscoutBasalRate.java      | 15 +++++++++++----
 app/src/main/res/values/strings.xml             |  6 ++++--
 app/src/main/res/xml/pref_data_source.xml       | 13 +++++++++----
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
index c3ca831a45..d27966b7a9 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
@@ -110,7 +110,9 @@ public static void work(final boolean live) {
                     NightscoutFollowService.updateTreatmentDownloaded();
                 }
 
-                NightscoutBasalRate.setTreatments(response);
+                if (basalRateDownloadEnabled()) {
+                    NightscoutBasalRate.setTreatments(response);
+                }
             } catch (Exception e) {
                 msg("Treatments: " + e);
             }
@@ -144,7 +146,7 @@ public static void work(final boolean live) {
                 msg("Nightscout follow entries error: " + e);
             }
 
-            if (profileDownloadEnabled()) {
+            if (basalRateDownloadEnabled()) {
                 if (JoH.ratelimit("nsfollow-profile-download", 60)) {
                     try {
                         getService().getProfiles(session.url.getHashedSecret()).enqueue(session.profilesCallback);
@@ -155,7 +157,7 @@ public static void work(final boolean live) {
                 }
             }
 
-            if (treatmentDownloadEnabled() || profileDownloadEnabled()) {
+            if (treatmentDownloadEnabled() || basalRateDownloadEnabled()) {
                 if (JoH.ratelimit("nsfollow-treatment-download", 60)) {
                     try {
                         getService().getTreatments(session.url.getHashedSecret()).enqueue(session.treatmentsCallback);
@@ -178,8 +180,8 @@ static boolean treatmentDownloadEnabled() {
         return Pref.getBooleanDefaultFalse("nsfollow_download_treatments");
     }
 
-    static boolean profileDownloadEnabled() {
-        return Pref.getBoolean("nsfollow_download_profile", true);
+    static boolean basalRateDownloadEnabled() {
+        return Pref.getBoolean("nsfollow_download_basalrate", true);
     }
 
     public static final TypeAdapter<Number> UNRELIABLE_INTEGER = new TypeAdapter<Number>() {
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
index e0dfcc160b..c8828a2c7d 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollowService.java
@@ -44,7 +44,8 @@
 public class NightscoutFollowService extends ForegroundService {
 
     private static final String TAG = "NightscoutFollow";
-    private static final long SAMPLE_PERIOD = 60_000;
+    private static final long SAMPLE_PERIOD = DEXCOM_PERIOD;
+    private static final long FREQUENT_PERIOD = 60_000;
 
     protected static volatile String lastState = "";
 
@@ -67,6 +68,10 @@ private void buggySamsungCheck() {
         wakeup_time = 0;
     }
 
+    static long connectPeriod() {
+        return Pref.getBoolean("nsfollow_download_per_minute", false) ? FREQUENT_PERIOD : SAMPLE_PERIOD;
+    }
+
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         final PowerManager.WakeLock wl = JoH.getWakeLock("NSFollow-osc", 60000);
@@ -88,7 +93,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             if (lastBg != null) {
                 lastBgTime = lastBg.timestamp;
             }
-            if (lastBg == null || JoH.msSince(lastBg.timestamp) > SAMPLE_PERIOD) {
+            if (lastBg == null || JoH.msSince(lastBg.timestamp) > connectPeriod()) {
                 if (JoH.ratelimit("last-ns-follow-poll", 5)) {
                     Inevitable.task("NS-Follow-Work", 200, () -> {
                         NightscoutFollow.work(true);
@@ -130,7 +135,7 @@ static void scheduleWakeUp() {
         final long last = lastBg != null ? lastBg.timestamp : 0;
 
         final long grace = Constants.SECOND_IN_MS * 10;
-        final long next = Anticipate.next(JoH.tsl(), last, SAMPLE_PERIOD, grace) + grace;
+        final long next = Anticipate.next(JoH.tsl(), last, connectPeriod(), grace) + grace;
         wakeup_time = next;
         UserError.Log.d(TAG, "Anticipate next: " + JoH.dateTimeText(next) + "  last: " + JoH.dateTimeText(last));
 
@@ -161,10 +166,10 @@ public static List<StatusItem> megaStatus() {
         Highlight ageOfLastBgPollHighlight = Highlight.NORMAL;
         if (bgReceiveDelay > 0) {
             ageOfBgLastPoll = JoH.niceTimeScalar(bgReceiveDelay);
-            if (bgReceiveDelay - lag > SAMPLE_PERIOD / 2) {
+            if (bgReceiveDelay - lag > connectPeriod() / 2) {
                 ageOfLastBgPollHighlight = Highlight.BAD;
             }
-            if (bgReceiveDelay - lag > SAMPLE_PERIOD * 2) {
+            if (bgReceiveDelay - lag > connectPeriod() * 2) {
                 ageOfLastBgPollHighlight = Highlight.CRITICAL;
             }
         }
@@ -175,7 +180,7 @@ public static List<StatusItem> megaStatus() {
         if (lastBg != null) {
             long age = JoH.msSince(lastBg.timestamp);
             ageLastBg = JoH.niceTimeScalar(age);
-            if (age > SAMPLE_PERIOD + hightlightGrace + lag) {
+            if (age > connectPeriod() + hightlightGrace + lag) {
                 bgAgeHighlight = Highlight.BAD;
             }
         }
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
index 31c97e2ab9..e2dbc3403f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
@@ -51,8 +51,18 @@ public static void setTreatments(final String response) throws Exception {
             if (absolute != null && durationInMilliseconds != null) {
                 final long timestamp = DateUtil.tolerantFromISODateString(tr.getString("created_at")).getTime();
 
+                APStatus lastAPStatus = APStatus.last();
+
+                if (lastAPStatus != null && timestamp < lastAPStatus.timestamp) {
+                    if (d) {
+
+                        UserError.Log.ueh(TAG, "APStatus exists: - value: " + lastAPStatus.basal_absolute + " - timestamp: " + JoH.dateTimeText(lastAPStatus.timestamp) + " Omitting: - value: " + absolute + " - timestamp: " + JoH.dateTimeText(timestamp));
+                    }
+                    continue;
+                }
+
                 if (d) {
-                    UserError.Log.ueh(TAG, "New Treatment from Nightscout: Temp Basal: " + absolute + " Event type: " + etype + " timestamp: " + JoH.dateTimeText(timestamp));
+                    UserError.Log.ueh(TAG, "New Temp Basal from Nightscout: - value: " + absolute + " - timestamp: " + JoH.dateTimeText(timestamp));
                 }
 
                 statusEntries.add(new APStatusEntry(absolute, timestamp, durationInMilliseconds, false));
@@ -113,9 +123,6 @@ public static void tryProcessBasalRate() {
             }
         }
 
-        // TODO: Should not be needed
-        statusEntries.sort(APStatusEntry::compare);
-
         statusEntries.forEach(entry -> {
             APStatus.createEfficientRecord(entry.timestamp, entry.absolute);
             NewDataObserver.newExternalStatus(false);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca8bc5c619..cf0d84eca0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1340,8 +1340,10 @@
     <string name="summary_nsfollow_download_treatments">Also download treatments from Nightscout as follower</string>
     <string name="title_nsfollow_download_treatments">Download Treatments</string>
     <string name="title_nsfollow_lag">Nightscout Follow delay</string>
-    <string name="summary_nsfollow_download_profile">Also download basal profile from Nightscout as follower</string>
-    <string name="title_nsfollow_download_profile">Download Basal Profile</string>
+    <string name="summary_nsfollow_download_basalrate">Download profile and TBR from Nightscout as follower (use with "Show Basal TBR" to see graph)</string>
+    <string name="title_nsfollow_download_basalrate">Download Basal Profile</string>
+    <string name="summary_nsfollow_download_per_minute">Download data from Nightscout every minute. Otherwise loads every 5 minutes.</string>
+    <string name="title_nsfollow_download_per_minute">Connect more frequently</string>
     <!-- Maybe we can use them later?
     <string name="title_clfollow_user">CareLink Username</string>
     <string name="summary_clfollow_user">CareLink login username</string>
diff --git a/app/src/main/res/xml/pref_data_source.xml b/app/src/main/res/xml/pref_data_source.xml
index 41c2371557..eaa1630aec 100644
--- a/app/src/main/res/xml/pref_data_source.xml
+++ b/app/src/main/res/xml/pref_data_source.xml
@@ -196,7 +196,7 @@
             android:key="nsfollow_download_treatments_screen"
             android:title="@string/title_nsfollow_download_treatments">
             <CheckBoxPreference
-                android:defaultValue="true"
+                android:defaultValue="false"
                 android:key="nsfollow_download_treatments"
                 android:summary="@string/summary_nsfollow_download_treatments"
                 android:title="@string/title_nsfollow_download_treatments" />
@@ -208,9 +208,14 @@
                 android:title="@string/title_cloud_storage_api_download_from_xdrip" />
             <CheckBoxPreference
                 android:defaultValue="true"
-                android:key="nsfollow_download_profile"
-                android:summary="@string/summary_nsfollow_download_profile"
-                android:title="@string/title_nsfollow_download_profile" />
+                android:key="nsfollow_download_basalrate"
+                android:summary="@string/summary_nsfollow_download_basalrate"
+                android:title="@string/title_nsfollow_download_basalrate" />
+            <CheckBoxPreference
+                    android:defaultValue="false"
+                    android:key="nsfollow_download_per_minute"
+                    android:summary="@string/summary_nsfollow_download_per_minute"
+                    android:title="@string/title_nsfollow_download_per_minute" />
         </PreferenceScreen>
         <ListPreference
             android:defaultValue="0"

From 15c2fd5c5350a6bffbb4b57f8258685231977c14 Mon Sep 17 00:00:00 2001
From: Jan <jan.rycko@gmail.com>
Date: Mon, 5 Aug 2024 20:54:03 +0200
Subject: [PATCH 5/8] Turn off debugging.

---
 .../dexdrip/utilitymodels/NightscoutBasalRate.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
index e2dbc3403f..90341fe136 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
@@ -14,7 +14,7 @@
 import java.util.*;
 
 public class NightscoutBasalRate {
-    private static final boolean d = true;
+    private static final boolean d = false;
     private static final String TAG = "NightscoutBasalRate";
     private static final int requiredSegments = 24;
     private static final int minimumProfileBRDuration = 10000;

From 78079a80ffbdbff25ec23870716a270632734bcd Mon Sep 17 00:00:00 2001
From: Jan <jan.rycko@gmail.com>
Date: Mon, 5 Aug 2024 20:56:05 +0200
Subject: [PATCH 6/8] Removed debugging log.

---
 .../eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
index d27966b7a9..6563037c0e 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/cgm/nsfollow/NightscoutFollow.java
@@ -125,8 +125,6 @@ public static void work(final boolean live) {
             try {
                 List<Double> profile = session.currentProfile.getDefaultBasalProfile();
 
-                UserError.Log.uel(TAG, "Profile: " + profile.toString());
-
                 BasalProfile.save(BasalProfile.getActiveRateName(), profile);
                 NightscoutBasalRate.setProfile(profile);
             } catch (Exception e) {

From 207126518a212e6e50f77f2d77cff6e807e7933d Mon Sep 17 00:00:00 2001
From: Jan <jan.rycko@gmail.com>
Date: Sat, 17 Aug 2024 00:28:34 +0200
Subject: [PATCH 7/8] =?UTF-8?q?Adding=20superpowers=20to=20BasalProfile=20?=
 =?UTF-8?q?=E2=80=93=20calculating=20profile=20for=20timespan.=20Adding=20?=
 =?UTF-8?q?BasalProfile=20line=20to=20BgGraphBuilder.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dexdrip/profileeditor/BasalProfile.java   | 54 ++++++++++++++++++-
 .../profileeditor/BasalProfileEntryTimed.java | 11 ++++
 .../dexdrip/utilitymodels/BgGraphBuilder.java | 44 +++++++++++----
 .../utilitymodels/NightscoutBasalRate.java    | 18 +++++--
 4 files changed, 113 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfileEntryTimed.java

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfile.java b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfile.java
index fc555acadf..25714662b2 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfile.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfile.java
@@ -9,6 +9,8 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -35,6 +37,56 @@ public static List<Float> load(final String ref) {
         return JsonStringToFloatList(Pref.getString(getPrefix(ref), ""));
     }
 
+
+    static int getHourOfTheDay(long timestamp) {
+        Calendar calendar = Calendar.getInstance();
+
+        calendar.setTimeInMillis(timestamp);
+
+        return calendar.get(Calendar.HOUR_OF_DAY);
+    }
+
+    static int getDifferenceInFullDays(long timestampA, long timestampB) {
+        Calendar calendarA = Calendar.getInstance();
+        Calendar calendarB = Calendar.getInstance();
+
+        calendarA.setTimeInMillis(timestampA);
+        calendarB.setTimeInMillis(timestampB);
+
+        return calendarB.get(Calendar.DAY_OF_YEAR) - calendarA.get(Calendar.DAY_OF_YEAR) + 1;
+    }
+
+    public static List<BasalProfileEntryTimed> loadForTime(final String ref, long startTime, long endTime) {
+        final List<Float> profile = load(ref);
+
+        int startHour = getHourOfTheDay(startTime);
+        int endHour = getHourOfTheDay(endTime);
+
+        int fullDays = getDifferenceInFullDays(startTime, endTime);
+
+        List<Float> profileForAllDays = new ArrayList<>();
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(startTime);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
+        for (int i = 0; i < fullDays; i++) {
+            profileForAllDays.addAll(profile);
+        }
+
+        List<Float> sublist = profileForAllDays.subList(startHour, profileForAllDays.size() - 24 + endHour + 1);
+        List<BasalProfileEntryTimed> timed = new ArrayList<>();
+
+        sublist.forEach(entry -> {
+            timed.add(new BasalProfileEntryTimed(entry, calendar.getTimeInMillis()));
+            calendar.add(Calendar.HOUR_OF_DAY, 1);
+        });
+
+        return timed;
+    }
+
     public static String getActiveRateName() {
         return Pref.getString(ACTIVE_BASAL_PROFILE, "1");
     }
@@ -113,4 +165,4 @@ public static String getAllProfilesAsJson() {
         return profiles.length() > 0 ? profiles.toString() : null;
     }
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfileEntryTimed.java b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfileEntryTimed.java
new file mode 100644
index 0000000000..5c19c80ffb
--- /dev/null
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfileEntryTimed.java
@@ -0,0 +1,11 @@
+package com.eveningoutpost.dexdrip.profileeditor;
+
+public class BasalProfileEntryTimed {
+    public Float absolute = null;
+    public Long timestamp = null;
+
+    BasalProfileEntryTimed(Float absolute, Long timestamp) {
+        this.absolute = absolute;
+        this.timestamp = timestamp;
+    }
+}
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
index 221ba90404..b2608711ce 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
@@ -34,6 +34,8 @@
 import com.eveningoutpost.dexdrip.models.Treatments;
 import com.eveningoutpost.dexdrip.models.UserError;
 import com.eveningoutpost.dexdrip.R;
+import com.eveningoutpost.dexdrip.profileeditor.BasalProfile;
+import com.eveningoutpost.dexdrip.profileeditor.BasalProfileEntryTimed;
 import com.eveningoutpost.dexdrip.services.ActivityRecognizedService;
 import com.eveningoutpost.dexdrip.calibrations.CalibrationAbstract;
 import com.eveningoutpost.dexdrip.calibrations.PluggableCalibration;
@@ -340,13 +342,14 @@ private List<Line> basalLines() {
             final float yscale = doMgdl ? (float) Constants.MMOLL_TO_MGDL : 1f;
 
             final List<APStatus> aplist = APStatus.latestForGraph(2000, loaded_start, loaded_end);
+            final List<BasalProfileEntryTimed> profile = BasalProfile.loadForTime(BasalProfile.getActiveRateName(), loaded_start, loaded_end);
 
             if (aplist.size() > 0) {
 
                 // divider line
 
                 final Line dividerLine = new Line();
-                dividerLine.setTag("tbr"); // not quite true
+                dividerLine.setTag("basal rate");
                 dividerLine.setHasPoints(false);
                 dividerLine.setHasLines(true);
                 dividerLine.setStrokeWidth(1);
@@ -356,24 +359,47 @@ private List<Line> basalLines() {
                 dividerLine.setHasPoints(false);
 
                 final float one_hundred_percent = (100 * yscale) / 100f;
-                final List<PointValue> divider_points = new ArrayList<>(2);
-                divider_points.add(new HPointValue(loaded_start / FUZZER, one_hundred_percent));
+                final float one_hundred_percent_as_absolute = profile.stream().map(x -> x.absolute).max(Float::compareTo).orElse(one_hundred_percent);
+                final List<PointValue> divider_points = new ArrayList<>(profile.size());
+
+                float last_absolute = -1;
+                float last_ypos = -1;
+                int count = profile.size();
+
+                for (BasalProfileEntryTimed item : profile) {
+                    if (--count == 0 || (item.absolute != last_absolute)) {
+                        if (last_ypos != -1) {
+                            divider_points.add(new HPointValue((double) item.timestamp / FUZZER, last_ypos));
+                        }
+
+                        final float this_ypos = (Math.min(item.absolute, 5 * one_hundred_percent_as_absolute) * yscale) / one_hundred_percent_as_absolute; // capped at 500%
+                        divider_points.add(new HPointValue((double) item.timestamp / FUZZER, this_ypos));
+
+                        last_absolute = item.absolute;
+                        last_ypos = this_ypos;
+                    }
+                }
+
+                if (last_ypos != -1) {
+                    divider_points.add(new HPointValue((double) (profile.get(profile.size() - 1).timestamp + 60 * 60 + 1000) / FUZZER, last_ypos));
+                }
+
                 dividerLine.setPointRadius(0);
-                divider_points.add(new HPointValue(loaded_end / FUZZER, one_hundred_percent));
                 dividerLine.setValues(divider_points);
+
                 basalLines.add(dividerLine);
 
                 final List<PointValue> points = new ArrayList<>(aplist.size());
 
-                int last_percent = -1;
+                double last_basal_absolute = -1;
+                count = aplist.size();
 
-                int count = aplist.size();
                 for (APStatus item : aplist) {
-                    if (--count == 0 || (item.basal_percent != last_percent)) {
-                        final float this_ypos = (Math.min(item.basal_percent, 500) * yscale) / 100f; // capped at 500%
+                    if (--count == 0 || (item.basal_absolute != last_basal_absolute)) {
+                        final double this_ypos = (Math.min(item.basal_absolute, 5 * one_hundred_percent_as_absolute) * yscale) / one_hundred_percent_as_absolute; // capped at 500%
                         points.add(new HPointValue((double) item.timestamp / FUZZER, this_ypos));
 
-                        last_percent = item.basal_percent;
+                        last_basal_absolute = item.basal_absolute;
                     }
                 }
 
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
index 90341fe136..fe219542af 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NightscoutBasalRate.java
@@ -17,7 +17,7 @@ public class NightscoutBasalRate {
     private static final boolean d = false;
     private static final String TAG = "NightscoutBasalRate";
     private static final int requiredSegments = 24;
-    private static final int minimumProfileBRDuration = 10000;
+    private static final int minimumProfileBRDuration = 1000;
 
     private static ArrayList<APStatusEntry> statusEntries = new ArrayList<>();
     private static List<Double> profile = new ArrayList<>();
@@ -35,6 +35,7 @@ public static void setTreatments(final String response) throws Exception {
 
             Double absolute = null;
             Long durationInMilliseconds = null;
+            Long timestamp = null;
 
             try {
                 absolute = tr.has("absolute") ? tr.getDouble("absolute") : null;
@@ -48,9 +49,13 @@ public static void setTreatments(final String response) throws Exception {
                 UserError.Log.e(TAG, "Could not parse durationInMilliseconds: " + tr.get("durationInMilliseconds"));
             }
 
-            if (absolute != null && durationInMilliseconds != null) {
-                final long timestamp = DateUtil.tolerantFromISODateString(tr.getString("created_at")).getTime();
+            try {
+                timestamp = tr.has("date") ? tr.getLong("date") : null;
+            } catch (JSONException e) {
+                UserError.Log.e(TAG, "Could not parse date: " + tr.get("date"));
+            }
 
+            if (absolute != null && durationInMilliseconds != null && timestamp != null) {
                 APStatus lastAPStatus = APStatus.last();
 
                 if (lastAPStatus != null && timestamp < lastAPStatus.timestamp) {
@@ -125,9 +130,10 @@ public static void tryProcessBasalRate() {
 
         statusEntries.forEach(entry -> {
             APStatus.createEfficientRecord(entry.timestamp, entry.absolute);
-            NewDataObserver.newExternalStatus(false);
         });
 
+        NewDataObserver.newExternalStatus(false);
+
         statusEntries = new ArrayList<>();
         profile = new ArrayList<>();
     }
@@ -169,6 +175,7 @@ class APStatusEntry {
     long timestamp;
     // For debugging
     long durationInMilliseconds;
+    double durationInMinutes;
     String timestampText;
     String timestampEndText;
     boolean isProfile;
@@ -178,9 +185,12 @@ public APStatusEntry(double absolute, long timestamp, long durationInMillisecond
         this.absolute = absolute;
         this.timestamp = timestamp;
         this.durationInMilliseconds = durationInMilliseconds;
+        this.durationInMinutes = (double) Math.round((double) durationInMilliseconds / 1000) / 60;
 
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault());
 
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+
         this.timestampText = df.format(new Date(timestamp));
         this.timestampEndText = df.format(new Date(timestamp + durationInMilliseconds));
         this.isProfile = isProfile;

From b01d927078db3d98f26558f5c9c10ac6f8964a01 Mon Sep 17 00:00:00 2001
From: Jan <jan.rycko@gmail.com>
Date: Sat, 17 Aug 2024 02:02:21 +0200
Subject: [PATCH 8/8] Final position in BgGraphBuilder for basal.

---
 .../dexdrip/profileeditor/BasalProfile.java   | 22 +++++++++----------
 .../dexdrip/utilitymodels/BgGraphBuilder.java | 10 +++++++--
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfile.java b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfile.java
index 25714662b2..30e48ad88f 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfile.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/profileeditor/BasalProfile.java
@@ -56,29 +56,29 @@ static int getDifferenceInFullDays(long timestampA, long timestampB) {
         return calendarB.get(Calendar.DAY_OF_YEAR) - calendarA.get(Calendar.DAY_OF_YEAR) + 1;
     }
 
-    public static List<BasalProfileEntryTimed> loadForTime(final String ref, long startTime, long endTime) {
+    public static List<BasalProfileEntryTimed> loadForTimeSpan(final String ref, long startTime, long endTime) {
         final List<Float> profile = load(ref);
 
-        int startHour = getHourOfTheDay(startTime);
-        int endHour = getHourOfTheDay(endTime);
-
         int fullDays = getDifferenceInFullDays(startTime, endTime);
 
         List<Float> profileForAllDays = new ArrayList<>();
 
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTimeInMillis(startTime);
-        calendar.set(Calendar.MINUTE, 0);
-        calendar.set(Calendar.SECOND, 0);
-        calendar.set(Calendar.MILLISECOND, 0);
-
         for (int i = 0; i < fullDays; i++) {
             profileForAllDays.addAll(profile);
         }
 
-        List<Float> sublist = profileForAllDays.subList(startHour, profileForAllDays.size() - 24 + endHour + 1);
+        int startHour = getHourOfTheDay(startTime);
+        int endHour = getHourOfTheDay(endTime);
+
+        List<Float> sublist = profileForAllDays.subList(startHour, profileForAllDays.size() - 24 + endHour);
         List<BasalProfileEntryTimed> timed = new ArrayList<>();
 
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTimeInMillis(startTime);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        calendar.set(Calendar.MILLISECOND, 0);
+
         sublist.forEach(entry -> {
             timed.add(new BasalProfileEntryTimed(entry, calendar.getTimeInMillis()));
             calendar.add(Calendar.HOUR_OF_DAY, 1);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
index b2608711ce..1def2978c6 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/BgGraphBuilder.java
@@ -342,7 +342,7 @@ private List<Line> basalLines() {
             final float yscale = doMgdl ? (float) Constants.MMOLL_TO_MGDL : 1f;
 
             final List<APStatus> aplist = APStatus.latestForGraph(2000, loaded_start, loaded_end);
-            final List<BasalProfileEntryTimed> profile = BasalProfile.loadForTime(BasalProfile.getActiveRateName(), loaded_start, loaded_end);
+            final List<BasalProfileEntryTimed> profile = BasalProfile.loadForTimeSpan(BasalProfile.getActiveRateName(), loaded_start, loaded_end);
 
             if (aplist.size() > 0) {
 
@@ -381,7 +381,7 @@ private List<Line> basalLines() {
                 }
 
                 if (last_ypos != -1) {
-                    divider_points.add(new HPointValue((double) (profile.get(profile.size() - 1).timestamp + 60 * 60 + 1000) / FUZZER, last_ypos));
+                    divider_points.add(new HPointValue((double) Calendar.getInstance().getTimeInMillis() / FUZZER, last_ypos));
                 }
 
                 dividerLine.setPointRadius(0);
@@ -392,6 +392,7 @@ private List<Line> basalLines() {
                 final List<PointValue> points = new ArrayList<>(aplist.size());
 
                 double last_basal_absolute = -1;
+                double last_basal_ypos = -1;
                 count = aplist.size();
 
                 for (APStatus item : aplist) {
@@ -400,9 +401,14 @@ private List<Line> basalLines() {
                         points.add(new HPointValue((double) item.timestamp / FUZZER, this_ypos));
 
                         last_basal_absolute = item.basal_absolute;
+                        last_basal_ypos = this_ypos;
                     }
                 }
 
+                if (last_basal_ypos != -1) {
+                    points.add(new HPointValue((double) Calendar.getInstance().getTimeInMillis() / FUZZER, last_basal_ypos));
+                }
+
                 final Line line = new Line(points);
                 line.setFilled(true);
                 line.setFillFlipped(true);