diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ui/MicroStatus.java b/app/src/main/java/com/eveningoutpost/dexdrip/ui/MicroStatus.java index 1e8f75e0f..de6f0b285 100644 --- 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 index 6a45bc461..f60b79db7 100644 --- 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 index f518f0207..2be2365e3 100644 --- a/app/src/main/res/layout/activity_system_status.xml +++ b/app/src/main/res/layout/activity_system_status.xml @@ -214,6 +214,7 @@