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

app/proguard-rules.pro

@@ -64,6 +64,16 @@
 -keep class android.support.v7.widget.SearchView { *; }
 -keep class kotlinx.serialization.Serializable { *; }
 
+# As long as we only deserialize (from a JSON string into an `NSDeviceStatus`
+# object in the class `AAPSStatusHandler`) we can simply ignore warnings related
+# to kotlinx serialization.
+# These rule should not cause problems: if a project actually relies on
+# serialization, then much more than just this class will be required,
+# so telling Proguard not to worry if this is missing will not prevent it
+# from emitting errors for code that does use serialization but somehow forgot
+# to depend on it.
+-dontwarn kotlinx.serialization.Serializable
+
 -dontwarn java.util.concurrent.**
 
 -keep class rx.schedulers.Schedulers {

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

@@ -58,7 +58,7 @@ public enum CalibrationState {
 
     private static final SparseArray<CalibrationState> lookup = new SparseArray<>();
     private static final ImmutableSet<CalibrationState> failed = ImmutableSet.of(SensorFailed, SensorFailed2, SensorFailed3, SensorFailed4, SensorFailed5, SensorFailed6, SensorFailedStart);
-    private static final ImmutableSet<CalibrationState> stopped = ImmutableSet.of(Stopped, Ended, SensorFailed, SensorFailed2, SensorFailed3, SensorFailed4, SensorFailed5, SensorFailed6, SensorFailedStart, SensorStopped);
+    private static final ImmutableSet<CalibrationState> stopped = ImmutableSet.of(Stopped, Ended, SensorExpired, SensorFailed, SensorFailed2, SensorFailed3, SensorFailed4, SensorFailed5, SensorFailed6, SensorFailedStart, SensorStopped);
     private static final ImmutableSet<CalibrationState> transitional = ImmutableSet.of(WarmingUp, SensorStarted, SensorStopped, CalibrationSent);
 
 

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

@@ -303,6 +303,7 @@ public static SensorType getSensorType(byte[] SensorInfo) {
                 return SensorType.LibreUS14Day;
             case 0x9d0830:
             case 0xc50930:
+            case 0xc60931:
                 return SensorType.Libre2;
             case 0x700010:
                 return SensorType.LibreProH;

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

@@ -1153,7 +1153,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             }
 
             minimize_scanning = Pref.getBooleanDefaultFalse("ob1_minimize_scanning");
-           // allow_scan_by_mac = Build.VERSION.SDK_INT >= 32 && shortTxId();
+            // allow_scan_by_mac = Build.VERSION.SDK_INT >= 32 && shortTxId();
             automata(); // sequence logic
 
             UserError.Log.d(TAG, "Releasing service start");

app/src/main/res/layout/activity_home.xml

@@ -540,21 +540,19 @@
 
                 <TextView
                     android:id="@+id/nanoStatusText"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_marginTop="2dp"
                     android:layout_marginStart="5dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:text="@{nano.color_watch, default=`Nano Status`}"
                     app:showIfTrue="@{nano.color_watch.length() > 0}"/>
 
                 <TextView
                     android:id="@+id/ExpiryStatusText"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_marginTop="2dp"
                     android:layout_marginStart="5dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:text="@{expiry.color_watch, default=`Expiry Status`}"
                     app:showIfTrue="@{(safeUnbox(vs.included[`sensor_expiry`])) &amp;&amp; (expiry.color_watch.length() > 0)}"/>
 

wear/src/main/java/com/eveningoutpost/dexdrip/models/LibreOOPAlgorithm.java

@@ -303,6 +303,7 @@ public static SensorType getSensorType(byte[] SensorInfo) {
                 return SensorType.LibreUS14Day;
             case 0x9d0830:
             case 0xc50930:
+            case 0xc60931:
                 return SensorType.Libre2;
             case 0x700010:
                 return SensorType.LibreProH;