Merge pull request #4260 from NightscoutFoundation/tzachi-libre2-source-identifier

Libre: add Libre2 source info identifier to processed L2 readings for oop as well.

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/LibreAlarmReceiver.java

@@ -74,11 +74,13 @@ private static boolean useGlucoseAsRaw() {
 
     private static void createBGfromGD(GlucoseData gd, boolean use_smoothed_data, boolean quick) {
         final double converted;
+        String sourceInfo = null;
         if (useGlucoseAsRaw()) {
             // if treating converted value as raw
             if (gd.glucoseLevel > 0) {
                 if (use_smoothed_data && gd.glucoseLevelSmoothed > 0) {
                     converted  = gd.glucoseLevelSmoothed * 1000;
+                    sourceInfo = LIBRE_SOURCE_INFO;
                     Log.e(TAG, "Using smoothed value as raw " + converted + " instead of " + gd.glucoseLevel);
                 } else {
                     converted = gd.glucoseLevel * 1000;
@@ -90,6 +92,7 @@ private static void createBGfromGD(GlucoseData gd, boolean use_smoothed_data, bo
             if (gd.glucoseLevelRaw > 0) {
                 if (use_smoothed_data && gd.glucoseLevelRawSmoothed > 0) {
                     converted = convert_for_dex(gd.glucoseLevelRawSmoothed);
+                    sourceInfo = LIBRE_SOURCE_INFO;
                     Log.d(TAG, "Using smoothed value " + converted + " instead of " + convert_for_dex(gd.glucoseLevelRaw) + gd);
                 } else {
                     converted = convert_for_dex(gd.glucoseLevelRaw);
@@ -107,7 +110,7 @@ private static void createBGfromGD(GlucoseData gd, boolean use_smoothed_data, bo
 
                 if (BgReading.getForPreciseTimestamp(gd.realDate, DexCollectionType.getCurrentDeduplicationPeriod(), false) == null) {
                     Log.d(TAG, "Creating bgreading at: " + JoH.dateTimeText(gd.realDate));
-                    BgReading.create(converted, converted, xdrip.getAppContext(), gd.realDate, quick); // quick lite insert
+                    BgReading.create(converted, converted, xdrip.getAppContext(), gd.realDate, quick, sourceInfo); // quick lite insert
                 } else {
                     if (d)
                         Log.d(TAG, "Ignoring duplicate timestamp for: " + JoH.dateTimeText(gd.realDate));

app/src/main/java/com/eveningoutpost/dexdrip/models/BgReading.java

@@ -484,6 +484,10 @@ public static BgReading create(double raw_data, double filtered_data, Context co
     }
 
     public static BgReading create(double raw_data, double filtered_data, Context context, Long timestamp, boolean quick) {
+        return create(raw_data, filtered_data, context, timestamp, quick, null);
+    }
+
+    public static BgReading create(double raw_data, double filtered_data, Context context, Long timestamp, boolean quick, String source_info) {
         if (context == null) context = xdrip.getAppContext();
         BgReading bgReading = new BgReading();
         final Sensor sensor = Sensor.currentSensor();
@@ -509,13 +513,15 @@ public static BgReading create(double raw_data, double filtered_data, Context co
             bgReading.calibration_flag = false;
 
             bgReading.calculateAgeAdjustedRawValue();
+            bgReading.source_info = source_info;
 
             bgReading.save();
             bgReading.perform_calculations();
             BgSendQueue.sendToPhone(context);
         } else {
             Log.d(TAG, "Calibrations, so doing everything: " + calibration.uuid);
             bgReading = createFromRawNoSave(sensor, calibration, raw_data, filtered_data, timestamp);
+            bgReading.source_info = source_info;
 
             bgReading.save();