From eedc38fbcf193811e92dc50eedb5e7a38b85de3c Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sun, 21 Jan 2018 15:56:07 +0100
Subject: [PATCH] synchronized access to basal_v

---
 .../main/java/info/nightscout/androidaps/data/Profile.java  | 6 +++---
 app/src/main/res/values-nl/strings.xml                      | 1 -
 app/src/main/res/values/strings.xml                         | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/data/Profile.java b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
index c7b7a89744..5235545362 100644
--- a/app/src/main/java/info/nightscout/androidaps/data/Profile.java
+++ b/app/src/main/java/info/nightscout/androidaps/data/Profile.java
@@ -193,7 +193,7 @@ public class Profile {
         return sparse;
     }
 
-    public boolean isValid(String from) {
+    public synchronized boolean isValid(String from) {
         if (!isValid)
             return false;
         if (!isValidated) {
@@ -404,7 +404,7 @@ public class Profile {
         return getBasal(secondsFromMidnight(time));
     }
 
-    public Double getBasal(Integer timeAsSeconds) {
+    public synchronized Double getBasal(Integer timeAsSeconds) {
         if (basal_v == null) {
             basal_v = convertToSparseArray(basal);
         }
@@ -425,7 +425,7 @@ public class Profile {
         public Double value;
     }
 
-    public BasalValue[] getBasalValues() {
+    public synchronized BasalValue[] getBasalValues() {
         if (basal_v == null)
             basal_v = convertToSparseArray(basal);
         BasalValue[] ret = new BasalValue[basal_v.size()];
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index eb42be81ba..e40e9c2b59 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -733,7 +733,6 @@
     <string name="active"><![CDATA[<Huidig>]]></string>
     <string name="none"><![CDATA[<geen>]]></string>
     <string name="app_name">AndroidAPS</string>
-    <string name="zerovalueinprofile" formatted="false">Nul waarde in basaal profiel %s</string>
     <string name="hasbgdata">BG beschikbaar op gekozen bron</string>
     <string name="positiveonly">Enkel positief</string>
     <string name="negativeonly">Enkel negatief</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 184b6adaba..4d875c7d99 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -810,7 +810,7 @@
     <string name="maxiobset">Maximal IOB set properly</string>
     <string name="hasbgdata">BG available from selected source</string>
     <string name="basalprofilenotaligned" formatted="false">Basal values not aligned to hours: %s</string>
-    <string name="zerovalueinprofile" formatted="false">Zero value in profile: %s</string>
+    <string name="zerovalueinprofile" formatted="false">Invalid profile: %s</string>
     <string name="combo_programming_bolus">Programming pump for bolusing</string>
     <string name="combo_refresh">Refresh</string>
     <string name="combo_tdds">TDDS</string>