Merge branch 'master' of https://github.com/NightscoutFoundation/xDrip

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1DexTransmitterBattery.java

@@ -95,8 +95,8 @@ public boolean voltageAWarning() {
     }
 
     public boolean voltageBWarning() {
-        if (shortTxId()) { // G7 only
-            return voltageB() < (G5BaseService.LOW_BATTERY_WARNING_LEVEL - 25);
+        if (shortTxId()) {
+            return voltageB() < (G5BaseService.LOW_BATTERY_WARNING_LEVEL - 60);
         }
         return voltageB() < (G5BaseService.LOW_BATTERY_WARNING_LEVEL - 10);
     };

app/src/main/java/com/eveningoutpost/dexdrip/services/UiBasedCollector.java

@@ -101,7 +101,8 @@ public class UiBasedCollector extends NotificationListenerService {
         coOptedPackages.add("com.medtronic.diabetes.simplera.eu");
         coOptedPackages.add("com.senseonics.gen12androidapp");
         coOptedPackages.add("com.senseonics.androidapp");
-        coOptedPackages.add("com.microtech.aidexx.mgdl"); // Experiment
+        coOptedPackages.add("com.microtech.aidexx.mgdl");
+        coOptedPackages.add("com.ottai.seas"); // Experiment
 
         coOptedPackagesAll.add("com.dexcom.dexcomone");
         coOptedPackagesAll.add("com.dexcom.d1plus");
@@ -110,7 +111,8 @@ public class UiBasedCollector extends NotificationListenerService {
         coOptedPackagesAll.add("com.medtronic.diabetes.simplera.eu");
         coOptedPackagesAll.add("com.senseonics.gen12androidapp");
         coOptedPackagesAll.add("com.senseonics.androidapp");
-        coOptedPackagesAll.add("com.microtech.aidexx.mgdl"); // Experiment
+        coOptedPackagesAll.add("com.microtech.aidexx.mgdl");
+        coOptedPackagesAll.add("com.ottai.seas"); // Experiment
 
         companionAppIoBPackages.add("com.insulet.myblue.pdm");
 

app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/SaveLogs.java

@@ -61,7 +61,7 @@ public void closeActivity(View myview) {
 
     public void saveLogs(View myview) {
         if (saveLogsToStorage(log_data)) {
-            UserError.Log.e(TAG, "Saved log file to /Downloads/xDrip-export/xDrip-log.txt");
+            UserError.Log.e(TAG, "Saved log file to /Download/xDrip-export/xDrip-log.txt");
         } else {
             UserError.Log.e(TAG, "Could not write log file");
         }

app/src/main/java/com/eveningoutpost/dexdrip/utils/QrCodeFromFile.java

@@ -34,7 +34,6 @@ public QrCodeFromFile setDesiredBarcodeFormats(Collection<String> desiredBarcode
     }
 
     public final void initiateFileScan() {
-        UserError.Log.e(TAG, "Navid_ initiate scan");
 
         // TODO Replace startActivityForResult with Androidx Activity Result APIs
         this.activity.startActivityForResult(this.createFileScanIntent(), Constants.ZXING_FILE_REQ_CODE);
@@ -53,12 +52,10 @@ private static List<String> list(String... values) {
     }
 
     public void scanFile() { // Copied (and slightly modified) from AndroidBarcode.scan()
-        UserError.Log.e(TAG, "Navid_ scanFile ");
         actuallyStartScanFile();
     }
 
     private void actuallyStartScanFile() {
-        UserError.Log.e(TAG, "Navid_ actuallyScan ");
         new QrCodeFromFile(activity)
                 .setDesiredBarcodeFormats(list("QR_CODE", "CODE_128"))
                 .initiateFileScan();