Merge branch 'dev' into rs

app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java

@@ -10,6 +10,7 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceManager;
+import android.text.TextUtils;
 
 import info.nightscout.androidaps.events.EventPreferenceChange;
 import info.nightscout.androidaps.events.EventRefreshGui;
@@ -76,7 +77,10 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
                 ((EditTextPreference) pref).setDialogMessage(editTextPref.getDialogMessage());
                 pref.setSummary(editTextPref.getText());
             }
-        }
+            else if(pref.getKey().contains("smscommunicator_allowednumbers") && TextUtils.isEmpty(editTextPref.getText().toString().trim())){
+                pref.setSummary(MainApp.sResources.getString(R.string.smscommunicator_allowednumbers_summary));
+            }
+           }
         if (pref instanceof MultiSelectListPreference) {
             EditTextPreference editTextPref = (EditTextPreference) pref;
             pref.setSummary(editTextPref.getText());

app/src/main/java/info/nightscout/androidaps/Services/DataService.java

@@ -316,28 +316,8 @@ public class DataService extends IntentService {
                 log.error("Unhandled exception", e);
             }
         }
-        if (intent.getAction().equals(Intents.ACTION_NEW_TREATMENT)) {
-            try {
-                if (bundles.containsKey("treatment")) {
-                    String trstring = bundles.getString("treatment");
-                    handleAddChangeDataFromNS(trstring);
-                }
-                if (bundles.containsKey("treatments")) {
-                    String trstring = bundles.getString("treatments");
-                    JSONArray jsonArray = new JSONArray(trstring);
-                    for (int i = 0; i < jsonArray.length(); i++) {
-                        JSONObject trJson = jsonArray.getJSONObject(i);
-                        String trstr = trJson.toString();
-                        handleAddChangeDataFromNS(trstr);
-                    }
-                }
-            } catch (Exception e) {
-                log.error("Unhandled exception", e);
-            }
 
-        }
+        if (intent.getAction().equals(Intents.ACTION_NEW_TREATMENT) || intent.getAction().equals(Intents.ACTION_CHANGED_TREATMENT)) {
-
-        if (intent.getAction().equals(Intents.ACTION_CHANGED_TREATMENT)) {
             try {
                 if (bundles.containsKey("treatment")) {
                     String trstring = bundles.getString("treatment");

app/src/main/java/info/nightscout/androidaps/Services/Intents.java

@@ -8,6 +8,9 @@ public interface Intents {
     String ACTION_NEW_PROFILE = "info.nightscout.client.NEW_PROFILE";
     String ACTION_NEW_SGV = "info.nightscout.client.NEW_SGV";
     String ACTION_NEW_DEVICESTATUS = "info.nightscout.client.NEW_DEVICESTATUS";
+    String ACTION_NEW_FOOD = "info.nightscout.client.NEW_FOOD";
+    String ACTION_CHANGED_FOOD = "info.nightscout.client.CHANGED_FOOD";
+    String ACTION_REMOVED_FOOD = "info.nightscout.client.REMOVED_FOOD";
     String ACTION_NEW_MBG = "info.nightscout.client.NEW_MBG";
     String ACTION_NEW_CAL = "info.nightscout.client.NEW_CAL";
     String ACTION_NEW_STATUS = "info.nightscout.client.NEW_STATUS";

app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java

@@ -33,6 +33,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.data.Profile;
 import info.nightscout.androidaps.events.EventCareportalEventChange;
 import info.nightscout.androidaps.events.EventExtendedBolusChange;
+import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventProfileSwitchChange;
 import info.nightscout.androidaps.events.EventRefreshOverview;
@@ -59,6 +60,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     public static final String DATABASE_DBREQUESTS = "DBRequests";
     public static final String DATABASE_CAREPORTALEVENTS = "CareportalEvents";
     public static final String DATABASE_PROFILESWITCHES = "ProfileSwitches";
+    public static final String DATABASE_FOODS = "Foods";
 
     private static final int DATABASE_VERSION = 8;
 
@@ -85,6 +87,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
     private static final ScheduledExecutorService profileSwitchEventWorker = Executors.newSingleThreadScheduledExecutor();
     private static ScheduledFuture<?> scheduledProfileSwitchEventPost = null;
 
+    public FoodHelper foodHelper = new FoodHelper(this);
+
     public DatabaseHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
         onCreate(getWritableDatabase(), getConnectionSource());
@@ -104,6 +108,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, ExtendedBolus.class);
             TableUtils.createTableIfNotExists(connectionSource, CareportalEvent.class);
             TableUtils.createTableIfNotExists(connectionSource, ProfileSwitch.class);
+            TableUtils.createTableIfNotExists(connectionSource, Food.class);
         } catch (SQLException e) {
             log.error("Can't create database", e);
             throw new RuntimeException(e);
@@ -128,6 +133,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                 TableUtils.dropTable(connectionSource, ExtendedBolus.class, true);
                 TableUtils.dropTable(connectionSource, CareportalEvent.class, true);
                 TableUtils.dropTable(connectionSource, ProfileSwitch.class, true);
+                TableUtils.dropTable(connectionSource, Food.class, true);
                 onCreate(database, connectionSource);
             }
         } catch (SQLException e) {
@@ -205,6 +211,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
             TableUtils.createTableIfNotExists(connectionSource, ExtendedBolus.class);
             TableUtils.createTableIfNotExists(connectionSource, CareportalEvent.class);
             TableUtils.createTableIfNotExists(connectionSource, ProfileSwitch.class);
+            foodHelper.resetFood();
             updateEarliestDataChange(0);
         } catch (SQLException e) {
             log.error("Unhandled exception", e);
@@ -217,6 +224,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         scheduleTemporaryTargetChange();
         scheduleCareportalEventChange();
         scheduleProfileSwitchChange();
+        foodHelper.scheduleFoodChange();
         new java.util.Timer().schedule(
                 new java.util.TimerTask() {
                     @Override
@@ -1672,4 +1680,5 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
         return null;
     }
 
+    // ---------------- Food handling ---------------
 }

app/src/main/java/info/nightscout/androidaps/db/Food.java

@@ -0,0 +1,107 @@
+package info.nightscout.androidaps.db;
+
+import com.j256.ormlite.field.DatabaseField;
+import com.j256.ormlite.table.DatabaseTable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Objects;
+
+/**
+ * Created by mike on 20.09.2017.
+ */
+
+
+@DatabaseTable(tableName = DatabaseHelper.DATABASE_FOODS)
+public class Food {
+    private static Logger log = LoggerFactory.getLogger(Food.class);
+
+    @DatabaseField(id = true)
+    public long key;
+
+    @DatabaseField
+    public boolean isValid = true;
+
+    @DatabaseField
+    public String _id; // NS _id
+
+    @DatabaseField
+    public String name;
+
+    @DatabaseField
+    public String category;
+
+    @DatabaseField
+    public String subcategory;
+
+    // Example:
+    // name="juice" portion=250 units="ml" carbs=12
+    // means 250ml of juice has 12g of carbs
+
+    @DatabaseField
+    public double portion; // common portion in "units"
+
+    @DatabaseField
+    public int carbs; // in grams
+
+    @DatabaseField
+    public int fat = 0; // in grams
+
+    @DatabaseField
+    public int protein = 0; // in grams
+
+    @DatabaseField
+    public int energy = 0; // in kJ
+
+    @DatabaseField
+    public String units = "g";
+
+    @DatabaseField
+    public int gi; // not used yet
+
+    public Food() {
+        key = System.currentTimeMillis();
+    }
+
+    public boolean isEqual(Food other) {
+        if (portion != other.portion)
+            return false;
+        if (carbs != other.carbs)
+            return false;
+        if (fat != other.fat)
+            return false;
+        if (protein != other.protein)
+            return false;
+        if (energy != other.energy)
+            return false;
+        if (gi != other.gi)
+            return false;
+        if (!Objects.equals(_id, other._id))
+            return false;
+        if (!Objects.equals(name, other.name))
+            return false;
+        if (!Objects.equals(category, other.category))
+            return false;
+        if (!Objects.equals(subcategory, other.subcategory))
+            return false;
+       if (!Objects.equals(units, other.units))
+            return false;
+        return true;
+    }
+
+    public void copyFrom(Food other) {
+        isValid = other.isValid;
+        _id = other._id;
+        name = other.name;
+        category = other.category;
+        subcategory = other.subcategory;
+        portion = other.portion;
+        carbs = other.carbs;
+        fat = other.fat;
+        protein = other.protein;
+        energy = other.energy;
+        units = other.units;
+        gi = other.gi;
+    }
+}

app/src/main/java/info/nightscout/androidaps/db/FoodHelper.java

@@ -0,0 +1,205 @@
+package info.nightscout.androidaps.db;
+
+import com.j256.ormlite.android.AndroidConnectionSource;
+import com.j256.ormlite.dao.Dao;
+import com.j256.ormlite.stmt.PreparedQuery;
+import com.j256.ormlite.stmt.QueryBuilder;
+import com.j256.ormlite.stmt.Where;
+import com.j256.ormlite.table.TableUtils;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.events.EventFoodDatabaseChanged;
+
+/**
+ * Created by mike on 24.09.2017.
+ */
+
+public class FoodHelper {
+    private static Logger log = LoggerFactory.getLogger(FoodHelper.class);
+
+    DatabaseHelper databaseHelper;
+
+    private static final ScheduledExecutorService foodEventWorker = Executors.newSingleThreadScheduledExecutor();
+    private static ScheduledFuture<?> scheduledFoodEventPost = null;
+
+    public FoodHelper(DatabaseHelper databaseHelper) {
+        this.databaseHelper = databaseHelper;
+    }
+
+    private Dao<Food, Long> getDaoFood() throws SQLException {
+        return databaseHelper.getDao(Food.class);
+    }
+
+    public void resetFood() {
+        try {
+            TableUtils.dropTable(databaseHelper.getConnectionSource(), Food.class, true);
+            TableUtils.createTableIfNotExists(databaseHelper.getConnectionSource(), Food.class);
+        } catch (SQLException e) {
+            log.error("Unhandled exception", e);
+        }
+        scheduleFoodChange();
+    }
+
+    public List<Food> getFoodData() {
+        try {
+            Dao<Food, Long> daoFood = getDaoFood();
+            List<Food> foods;
+            QueryBuilder<Food, Long> queryBuilder = daoFood.queryBuilder();
+            PreparedQuery<Food> preparedQuery = queryBuilder.prepare();
+            foods = daoFood.query(preparedQuery);
+            return foods;
+        } catch (SQLException e) {
+            log.error("Unhandled exception", e);
+        }
+        return new ArrayList<>();
+    }
+
+    public boolean createOrUpdate(Food food) {
+        try {
+            // find by NS _id
+            if (food._id != null) {
+                Food old;
+
+                QueryBuilder<Food, Long> queryBuilder = getDaoFood().queryBuilder();
+                Where where = queryBuilder.where();
+                where.eq("_id", food._id);
+                PreparedQuery<Food> preparedQuery = queryBuilder.prepare();
+                List<Food> found = getDaoFood().query(preparedQuery);
+                if (found.size() > 0) {
+                    old = found.get(0);
+                    if (!old.isEqual(food)) {
+                        getDaoFood().delete(old); // need to delete/create because date may change too
+                        old.copyFrom(food);
+                        getDaoFood().create(old);
+                        log.debug("FOOD: Updating record by _id: " + old.toString());
+                        scheduleFoodChange();
+                        return true;
+                    }
+                }
+            }
+            getDaoFood().createOrUpdate(food);
+            log.debug("FOOD: New record: " + food.toString());
+            scheduleFoodChange();
+            return true;
+        } catch (SQLException e) {
+            log.error("Unhandled exception", e);
+        }
+        return false;
+    }
+
+    public void delete(Food food) {
+        try {
+            getDaoFood().delete(food);
+            scheduleFoodChange();
+        } catch (SQLException e) {
+            log.error("Unhandled exception", e);
+        }
+    }
+
+    public static void scheduleFoodChange() {
+        class PostRunnable implements Runnable {
+            public void run() {
+                log.debug("Firing EventFoodChange");
+                MainApp.bus().post(new EventFoodDatabaseChanged());
+                scheduledFoodEventPost = null;
+            }
+        }
+        // prepare task for execution in 1 sec
+        // cancel waiting task to prevent sending multiple posts
+        if (scheduledFoodEventPost != null)
+            scheduledFoodEventPost.cancel(false);
+        Runnable task = new PostRunnable();
+        final int sec = 1;
+        scheduledFoodEventPost = foodEventWorker.schedule(task, sec, TimeUnit.SECONDS);
+
+    }
+
+    /*
+    {
+        "_id": "551ee3ad368e06e80856e6a9",
+        "type": "food",
+        "category": "Zakladni",
+        "subcategory": "Napoje",
+        "name": "Mleko",
+        "portion": 250,
+        "carbs": 12,
+        "gi": 1,
+        "created_at": "2015-04-14T06:59:16.500Z",
+        "unit": "ml"
+    }
+     */
+    public void createFoodFromJsonIfNotExists(JSONObject trJson) {
+        try {
+            Food food = new Food();
+            if (trJson.has("type") && trJson.getString("type").equals("food")) {
+                if (trJson.has("_id"))
+                    food._id = trJson.getString("_id");
+                if (trJson.has("category"))
+                    food.category = trJson.getString("category");
+                if (trJson.has("subcategory"))
+                    food.subcategory = trJson.getString("subcategory");
+                if (trJson.has("name"))
+                    food.name = trJson.getString("name");
+                if (trJson.has("unit"))
+                    food.units = trJson.getString("unit");
+                if (trJson.has("portion"))
+                    food.portion = trJson.getDouble("portion");
+                if (trJson.has("carbs"))
+                    food.carbs = trJson.getInt("carbs");
+                if (trJson.has("gi"))
+                    food.gi = trJson.getInt("gi");
+                if (trJson.has("energy"))
+                    food.energy = trJson.getInt("energy");
+                if (trJson.has("protein"))
+                    food.protein = trJson.getInt("protein");
+                if (trJson.has("fat"))
+                    food.fat = trJson.getInt("fat");
+            }
+            createOrUpdate(food);
+        } catch (JSONException e) {
+            log.error("Unhandled exception", e);
+        }
+    }
+
+    public void deleteFoodById(String _id) {
+        Food stored = findFoodById(_id);
+        if (stored != null) {
+            log.debug("FOOD: Removing Food record from database: " + stored.toString());
+            delete(stored);
+            scheduleFoodChange();
+        }
+    }
+
+    public Food findFoodById(String _id) {
+        try {
+            QueryBuilder<Food, Long> queryBuilder = getDaoFood().queryBuilder();
+            Where where = queryBuilder.where();
+            where.eq("_id", _id);
+            PreparedQuery<Food> preparedQuery = queryBuilder.prepare();
+            List<Food> list = getDaoFood().query(preparedQuery);
+
+            if (list.size() == 1) {
+                return list.get(0);
+            } else {
+                return null;
+            }
+        } catch (SQLException e) {
+            log.error("Unhandled exception", e);
+        }
+        return null;
+    }
+
+}

app/src/main/java/info/nightscout/androidaps/events/EventFoodDatabaseChanged.java

@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.events;
+
+/**
+ * Created by mike on 20.09.2017.
+ */
+
+public class EventFoodDatabaseChanged {
+}

app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/FillDialog.java

@@ -180,7 +180,7 @@ public class FillDialog extends DialogFragment implements OnClickListener {
                                         builder.setMessage(result.comment);
                                         builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
                                         builder.show();
-                                    } catch (WindowManager.BadTokenException e) {
+                                    } catch (WindowManager.BadTokenException | NullPointerException e) {
                                         // window has been destroyed
                                         Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
                                         MainApp.bus().post(new EventNewNotification(notification));

app/src/main/java/info/nightscout/androidaps/plugins/Actions/dialogs/NewExtendedBolusDialog.java

@@ -112,7 +112,7 @@ public class NewExtendedBolusDialog extends DialogFragment implements View.OnCli
                                         builder.setMessage(result.comment);
                                         builder.setPositiveButton(context.getString(R.string.ok), null);
                                         builder.show();
-                                        } catch (WindowManager.BadTokenException e) {
+                                        } catch (WindowManager.BadTokenException | NullPointerException e) {
                                             // window has been destroyed
                                             Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
                                             MainApp.bus().post(new EventNewNotification(notification));

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastDeviceStatus.java

@@ -67,4 +67,31 @@ public class BroadcastDeviceStatus {
             }
         }
     }
+
+    public static void handleNewFoods(JSONArray foods, Context context, boolean isDelta) {
+
+        List<JSONArray> splitted = BroadcastTreatment.splitArray(foods);
+        for (JSONArray part: splitted) {
+            Bundle bundle = new Bundle();
+            bundle.putString("foods", part.toString());
+            bundle.putBoolean("delta", isDelta);
+            Intent intent = new Intent(Intents.ACTION_NEW_FOOD);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
+        }
+
+        if(SP.getBoolean(R.string.key_nsclient_localbroadcasts, true)) {
+            splitted = BroadcastTreatment.splitArray(foods);
+            for (JSONArray part : splitted) {
+                Bundle bundle = new Bundle();
+                bundle.putString("foods", part.toString());
+                bundle.putBoolean("delta", isDelta);
+                Intent intent = new Intent(Intents.ACTION_NEW_FOOD);
+                intent.putExtras(bundle);
+                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+                context.sendBroadcast(intent);
+            }
+        }
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/broadcasts/BroadcastFood.java

@@ -0,0 +1,104 @@
+package info.nightscout.androidaps.plugins.NSClientInternal.broadcasts;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.content.LocalBroadcastManager;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import info.nightscout.androidaps.MainApp;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.Services.Intents;
+import info.nightscout.androidaps.plugins.NSClientInternal.data.NSTreatment;
+import info.nightscout.utils.SP;
+
+/**
+ * Created by mike on 20.02.2016.
+ */
+public class BroadcastFood {
+    private static Logger log = LoggerFactory.getLogger(BroadcastFood.class);
+
+    public static void handleNewFood(JSONArray foods, Context context, boolean isDelta) {
+
+        List<JSONArray> splitted = BroadcastTreatment.splitArray(foods);
+        for (JSONArray part : splitted) {
+            Bundle bundle = new Bundle();
+            bundle.putString("foods", part.toString());
+            bundle.putBoolean("delta", isDelta);
+            Intent intent = new Intent(Intents.ACTION_NEW_FOOD);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
+        }
+
+        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, true)) {
+            for (JSONArray part : splitted) {
+                Bundle bundle = new Bundle();
+                bundle.putString("foods", part.toString());
+                bundle.putBoolean("delta", isDelta);
+                Intent intent = new Intent(Intents.ACTION_NEW_FOOD);
+                intent.putExtras(bundle);
+                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+                context.sendBroadcast(intent);
+            }
+        }
+    }
+
+    public static void handleChangedFood(JSONArray foods, Context context, boolean isDelta) {
+
+        List<JSONArray> splitted = BroadcastTreatment.splitArray(foods);
+        for (JSONArray part : splitted) {
+            Bundle bundle = new Bundle();
+            bundle.putString("foods", part.toString());
+            bundle.putBoolean("delta", isDelta);
+            Intent intent = new Intent(Intents.ACTION_CHANGED_FOOD);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
+        }
+
+        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, true)) {
+            for (JSONArray part : splitted) {
+                Bundle bundle = new Bundle();
+                bundle.putString("foods", part.toString());
+                bundle.putBoolean("delta", isDelta);
+                Intent intent = new Intent(Intents.ACTION_CHANGED_FOOD);
+                intent.putExtras(bundle);
+                intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+                context.sendBroadcast(intent);
+            }
+        }
+    }
+
+    public static void handleRemovedFood(JSONArray foods, Context context, boolean isDelta) {
+
+        Bundle bundle = new Bundle();
+        bundle.putString("foods", foods.toString());
+        bundle.putBoolean("delta", isDelta);
+        Intent intent = new Intent(Intents.ACTION_REMOVED_FOOD);
+        intent.putExtras(bundle);
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+        LocalBroadcastManager.getInstance(MainApp.instance()).sendBroadcast(intent);
+
+
+        if (SP.getBoolean(R.string.key_nsclient_localbroadcasts, true)) {
+            bundle = new Bundle();
+            bundle.putString("foods", foods.toString());
+            bundle.putBoolean("delta", isDelta);
+            intent = new Intent(Intents.ACTION_REMOVED_FOOD);
+            intent.putExtras(bundle);
+            intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+            context.sendBroadcast(intent);
+        }
+    }
+
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/NSClientInternal/services/NSClientService.java

@@ -43,6 +43,7 @@ import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastA
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastCals;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastClearAlarm;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastDeviceStatus;
+import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastFood;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastMbgs;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastProfile;
 import info.nightscout.androidaps.plugins.NSClientInternal.broadcasts.BroadcastSgvs;
@@ -519,6 +520,55 @@ public class NSClientService extends Service {
                                     BroadcastDeviceStatus.handleNewDeviceStatus(devicestatuses, MainApp.instance().getApplicationContext(), isDelta);
                                 }
                             }
+                            if (data.has("food")) {
+                                JSONArray foods = data.getJSONArray("food");
+                                JSONArray removedFoods = new JSONArray();
+                                JSONArray updatedFoods = new JSONArray();
+                                JSONArray addedFoods = new JSONArray();
+                                if (foods.length() > 0)
+                                    MainApp.bus().post(new EventNSClientNewLog("DATA", "received " + foods.length() + " foods"));
+                                for (Integer index = 0; index < foods.length(); index++) {
+                                    JSONObject jsonFood = foods.getJSONObject(index);
+                                    NSTreatment treatment = new NSTreatment(jsonFood);
+
+                                    // remove from upload queue if Ack is failing
+                                    UploadQueue.removeID(jsonFood);
+                                    //Find latest date in treatment
+                                    if (treatment.getMills() != null && treatment.getMills() < System.currentTimeMillis())
+                                        if (treatment.getMills() > latestDateInReceivedData)
+                                            latestDateInReceivedData = treatment.getMills();
+
+                                    if (treatment.getAction() == null) {
+                                        addedFoods.put(jsonFood);
+                                    } else if (treatment.getAction().equals("update")) {
+                                        updatedFoods.put(jsonFood);
+                                    } else if (treatment.getAction().equals("remove")) {
+                                        if (treatment.getMills() != null && treatment.getMills() > System.currentTimeMillis() - 24 * 60 * 60 * 1000L) // handle 1 day old deletions only
+                                            removedFoods.put(jsonFood);
+                                    }
+                                }
+                                if (removedFoods.length() > 0) {
+                                    BroadcastFood.handleRemovedFood(removedFoods, MainApp.instance().getApplicationContext(), isDelta);
+                                }
+                                if (updatedFoods.length() > 0) {
+                                    BroadcastFood.handleChangedFood(updatedFoods, MainApp.instance().getApplicationContext(), isDelta);
+                                }
+                                if (addedFoods.length() > 0) {
+                                    BroadcastFood.handleNewFood(addedFoods, MainApp.instance().getApplicationContext(), isDelta);
+                                }
+                            }
+                            if (data.has("")) {
+                                JSONArray foods = data.getJSONArray("food");
+                                if (foods.length() > 0) {
+                                    MainApp.bus().post(new EventNSClientNewLog("DATA", "received " + foods.length() + " foods"));
+                                    for (Integer index = 0; index < foods.length(); index++) {
+                                        JSONObject jsonFood = foods.getJSONObject(index);
+                                        // remove from upload queue if Ack is failing
+                                        UploadQueue.removeID(jsonFood);
+                                    }
+                                    BroadcastDeviceStatus.handleNewFoods(foods, MainApp.instance().getApplicationContext(), isDelta);
+                                }
+                            }
                             if (data.has("mbgs")) {
                                 JSONArray mbgs = data.getJSONArray("mbgs");
                                 if (mbgs.length() > 0)

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/NewTreatmentDialog.java

@@ -127,7 +127,7 @@ public class NewTreatmentDialog extends DialogFragment implements OnClickListene
                                                 builder.setMessage(result.comment);
                                                 builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
                                                 builder.show();
-                                            } catch (WindowManager.BadTokenException e) {
+                                            } catch (WindowManager.BadTokenException | NullPointerException e) {
                                                 // window has been destroyed
                                                 Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
                                                 MainApp.bus().post(new EventNewNotification(notification));

app/src/main/java/info/nightscout/androidaps/plugins/Overview/Dialogs/WizardDialog.java

@@ -367,7 +367,7 @@ public class WizardDialog extends DialogFragment implements OnClickListener, Com
                                                 builder.setMessage(result.comment);
                                                 builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
                                                 builder.show();
-                                            } catch (WindowManager.BadTokenException e) {
+                                            } catch (WindowManager.BadTokenException | NullPointerException e) {
                                                 // window has been destroyed
                                                 Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
                                                 MainApp.bus().post(new EventNewNotification(notification));

app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java

@@ -713,7 +713,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
                                             builder.setMessage(result.comment);
                                             builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
                                             builder.show();
-                                        } catch (WindowManager.BadTokenException e) {
+                                        } catch (WindowManager.BadTokenException | NullPointerException e) {
                                             // window has been destroyed
                                             Notification notification = new Notification(Notification.BOLUS_DELIVERY_ERROR, MainApp.sResources.getString(R.string.treatmentdeliveryerror), Notification.URGENT);
                                             MainApp.bus().post(new EventNewNotification(notification));

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaR/DanaRPlugin.java

@@ -506,7 +506,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         }
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
-        if (pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
+        if (runningTB != null && runningTB.percentRate == percent) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
@@ -550,7 +551,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
         insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep * (1 + durationInHalfHours % 1));
 
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = false;
             result.success = true;
             result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
@@ -601,7 +603,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
 
     public PumpEnactResult cancelRealTempBasal() {
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isTempBasalInProgress) {
+        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
+        if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
             result.isTempCancel = true;
@@ -625,7 +628,8 @@ public class DanaRPlugin implements PluginBase, PumpInterface, DanaRInterface, C
     @Override
     public PumpEnactResult cancelExtendedBolus() {
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isExtendedInProgress) {
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null) {
             sExecutionService.extendedBolusStop();
             result.enacted = true;
             result.isTempCancel = true;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRKorean/DanaRKoreanPlugin.java

@@ -503,7 +503,8 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         }
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
-        if (pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
+        if (runningTB != null && runningTB.percentRate == percent) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
@@ -547,7 +548,8 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
         insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep * (1 + durationInHalfHours % 1));
 
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = false;
             result.success = true;
             result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
@@ -598,7 +600,8 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
 
     public PumpEnactResult cancelRealTempBasal() {
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isTempBasalInProgress) {
+        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
+        if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
             result.isTempCancel = true;
@@ -622,7 +625,8 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, DanaRInterf
     @Override
     public PumpEnactResult cancelExtendedBolus() {
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isExtendedInProgress) {
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null) {
             sExecutionService.extendedBolusStop();
             result.enacted = true;
             result.isTempCancel = true;

app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRv2/DanaRv2Plugin.java

@@ -429,7 +429,8 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         }
         if (percent > getPumpDescription().maxTempPercent)
             percent = getPumpDescription().maxTempPercent;
-        if (pump.isTempBasalInProgress && pump.tempBasalPercent == percent) {
+        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
+        if (runningTB != null && runningTB.percentRate == percent) {
             result.enacted = false;
             result.success = true;
             result.isTempCancel = false;
@@ -494,7 +495,8 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
         int durationInHalfHours = Math.max(durationInMinutes / 30, 1);
         insulin = Round.roundTo(insulin, getPumpDescription().extendedBolusStep * (1 + durationInHalfHours % 1));
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isExtendedInProgress && Math.abs(pump.extendedBolusAmount - insulin) < getPumpDescription().extendedBolusStep) {
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null && Math.abs(runningEB.insulin - insulin) < getPumpDescription().extendedBolusStep) {
             result.enacted = false;
             result.success = true;
             result.comment = MainApp.instance().getString(R.string.virtualpump_resultok);
@@ -530,7 +532,8 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
     @Override
     public PumpEnactResult cancelTempBasal(boolean force) {
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isTempBasalInProgress) {
+        TemporaryBasal runningTB =  MainApp.getConfigBuilder().getTempBasalFromHistory(System.currentTimeMillis());
+        if (runningTB != null) {
             sExecutionService.tempBasalStop();
             result.enacted = true;
             result.isTempCancel = true;
@@ -554,7 +557,8 @@ public class DanaRv2Plugin implements PluginBase, PumpInterface, DanaRInterface,
     @Override
     public PumpEnactResult cancelExtendedBolus() {
         PumpEnactResult result = new PumpEnactResult();
-        if (pump.isExtendedInProgress) {
+        ExtendedBolus runningEB = MainApp.getConfigBuilder().getExtendedBolusFromHistory(System.currentTimeMillis());
+        if (runningEB != null) {
             sExecutionService.extendedBolusStop();
             result.enacted = true;
             result.isTempCancel = true;