diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
index b80bcdd4d0..69240fde61 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
@@ -1126,6 +1126,7 @@ public static boolean shortTxId() {
return getTransmitterID().length() < 6;
}
+
private static Ob1Work enqueueCommand(BaseMessage tm, String msg) {
if (tm != null) {
final Ob1Work item = new Ob1Work(tm, msg);
diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
index 4faa7f6461..8db254ccb3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
@@ -1,5 +1,6 @@
package com.eveningoutpost.dexdrip.utils;
+import static com.eveningoutpost.dexdrip.utils.DexCollectionType.getBestCollectorHardwareName;
import static com.eveningoutpost.dexdrip.xdrip.gs;
import android.Manifest;
@@ -1731,6 +1732,16 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
}
}
+ if (getBestCollectorHardwareName().equals("G7")) { // Remove battery options, from G5/G6/Dex1/G7 Debug Settings, if we are using G7 or One+
+ try {
+ PreferenceScreen screen = (PreferenceScreen) findPreference("xdrip_plus_g5_extra_settings");
+ Preference pref = getPreferenceManager().findPreference("dex_battery_category");
+ screen.removePreference(pref);
+ } catch (Exception e) {
+ UserError.Log.wtf(TAG, "Failed to remove G7 battery options");
+ }
+ }
+
//Remove CL prefs for NON CLFollower
if (collectionType != DexCollectionType.CLFollow) {
try {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 407600f987..31ec97656c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1390,7 +1390,7 @@
OB1 collector can initiate bonding.
Allow OB1 initiate bonding
Old G5 Collector Settings
- G5/G6/G7/1 battery options
+ G5/G6/Dex1 battery options
Adjust battery warning level
Plugins and Features
Heart rate monitor