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 5992a73a18..d32ceacd80 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/g5model/Ob1G5StateMachine.java
@@ -1729,9 +1729,15 @@ public static void evaluateG6Settings() {
} else if (!onlyUsingNativeMode() && !Home.get_engineering_mode()) {
// TODO revisit this now that there is scaling
setG6Defaults();
- UserError.Log.uel(TAG, "Dex Native mode enabled. For your device, non-native mode is either not possible or not recommended.");
+ UserError.Log.wtf(TAG, "Dex Native mode enabled. For your device, non-native mode is either not possible or not recommended.");
JoH.showNotification("Enabled Native", "Native mode enabled", null, Constants.G6_DEFAULTS_MESSAGE, false, true, false);
}
+ if (FirmwareCapability.isTransmitterRawIncapable(getTransmitterID())) { // If we are using a G7 or G6 Firefly (mod or not)
+ if (Pref.getBooleanDefaultFalse("ob1_g5_restart_sensor") && !Home.get_engineering_mode()) { // If restart is enabled, not in engineering mode
+ Pref.setBoolean("ob1_g5_restart_sensor", false); // Disable restart
+ UserError.Log.wtf(TAG, "Restart sensor disabled. You cannot simply restart sensor with your device.");
+ }
+ }
}
}
}
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 f4542a9555..bfda878ff3 100644
--- a/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
+++ b/app/src/main/java/com/eveningoutpost/dexdrip/utils/Preferences.java
@@ -1912,13 +1912,13 @@ public void onClick(DialogInterface dialog, int which) {
}
}
-
- if (!engineering_mode) {
- try {
- ((PreferenceScreen) findPreference("dexcom_server_upload_screen")).removePreference(findPreference("share_test_key"));
- } catch (Exception e) {
- //
- }
+ // Hide receiver serial number settings
+ // Hiding a setting without deleting it makes it invisible to the user while it can still define the setting value.
+ try {
+ ((PreferenceScreen) findPreference("dexcom_server_upload_screen")).removePreference(findPreference("share_test_key"));
+ ((PreferenceScreen) findPreference("dexcom_server_upload_screen")).removePreference(findPreference("share_key"));
+ } catch (Exception e) {
+ //
}
//if (engineering_mode) {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7bc4a2e2d1..96c77ea6be 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -312,8 +312,8 @@
Use Excessive Wakelocks
Speak Readings
Extra Status Line
- Dexcom Share Server Upload
- Upload data to Dexcoms Servers so you can use your data with Dexcoms apps
+ Dex Share
+ Upload data to Dex Share Servers
Manage Followers
Manage your existing followers and invite new ones.
Invite a Follower
@@ -759,15 +759,15 @@
InfluxDB database name
User
Password
- Enable this to upload to Dexcom\'s servers
- Upload BG values as Dexcom Share
+ Enable this to upload to Dex Share servers
+ Upload BG values to Dex Share
Disabled = Your account and follower apps are from outside the USA
Enabled = Your account and follower apps are from the USA
- Dexcom USA based account
- Your login for Dexcom\'s Website
- Dexcom Account Login
- Your password for Dexcom\'s Website
- Dexcom Account Password
+ Dex USA based account
+ Your login for Dex share
+ Dex Account Login
+ Your password for Dex share
+ Dex Account Password
10-Character Dexcom Receiver serial number
10-Character Test Mode serial number
Glucose Meters
diff --git a/app/src/main/res/xml/pref_data_sync.xml b/app/src/main/res/xml/pref_data_sync.xml
index e5e99bcc47..8adf428449 100644
--- a/app/src/main/res/xml/pref_data_sync.xml
+++ b/app/src/main/res/xml/pref_data_sync.xml
@@ -259,16 +259,6 @@
android:key="share_test_key"
android:shouldDisableView="true"
android:title="@string/dexcom_test_mode_serial" />
-
-
-