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

NightscoutFoundation · Mar 27, 2024 · efb3322 · efb3322
2 parents 6667fa6 + a018afb
commit efb3322
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/MicroStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/MicroStatus.java
@@ -12,4 +12,5 @@ public interface MicroStatus {
 
     boolean xmitterBattery();
 
+
 }
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/MicroStatusImpl.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/MicroStatusImpl.java
@@ -4,6 +4,8 @@
  * Created by jamorham on 29/09/2017.
  */
 
+import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getBestCollectorHardwareName;
+
 import androidx.databinding.BaseObservable;
 
 import com.eveningoutpost.dexdrip.utils.DexCollectionType;
@@ -28,12 +30,13 @@ public String gs(String id) {
     }
 
     @Override
-    public boolean bluetooth() {
-        return DexCollectionType.hasBluetooth();
+    public boolean bluetooth() { // Dexcom with Bluetooth except G7
+        return DexCollectionType.hasBluetooth() && !getBestCollectorHardwareName().equals("G7");
     }
 
     @Override
     public boolean xmitterBattery() {
         return DexCollectionType.usesClassicTransmitterBattery();
     }
+
 }
diff --git a/app/src/main/res/layout/activity_system_status.xml b/app/src/main/res/layout/activity_system_status.xml
@@ -214,6 +214,7 @@
 
                     <Button
                         android:id="@+id/forget_device"
+                        app:showIfTrue="@{ms.bluetooth()}"
                         style="?android:attr/buttonStyleSmall"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"