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

Author: jamorham

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.");
+                    }
+                }
             }
         }
     }

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) {

app/src/main/res/values/strings.xml

@@ -312,8 +312,8 @@
     <string name="use_excessive_wakelocks">Use Excessive Wakelocks</string>
     <string name="speak_readings">Speak Readings</string>
     <string name="extra_status_line">Extra Status Line</string>
-    <string name="dexcom_share_server_upload">Dexcom Share Server Upload</string>
-    <string name="upload_data_to_dex_servers">Upload data to Dexcoms Servers so you can use your data with Dexcoms apps</string>
+    <string name="dexcom_share_server_upload">Dex Share</string>
+    <string name="upload_data_to_dex_servers">Upload data to Dex Share Servers</string>
     <string name="manage_followers">Manage Followers</string>
     <string name="manage_existing_followers">Manage your existing followers and invite new ones.</string>
     <string name="invite_follower">Invite a Follower</string>
@@ -759,15 +759,15 @@
     <string name="influxdb_database_name">InfluxDB database name</string>
     <string name="user">User</string>
     <string name="password">Password</string>
-    <string name="upload_to_dexcom">Enable this to upload to Dexcom\'s servers</string>
-    <string name="upload_to_dexcom_share">Upload BG values as Dexcom Share</string>
+    <string name="upload_to_dexcom">Enable this to upload to Dex Share servers</string>
+    <string name="upload_to_dexcom_share">Upload BG values to Dex Share</string>
     <string name="accounts_outside_usa">Disabled = Your account and follower apps are from outside the USA</string>
     <string name="accounts_inside_usa">Enabled = Your account and follower apps are from the USA</string>
-    <string name="usa_based_account">Dexcom USA based account</string>
-    <string name="dexcom_login">Your login for Dexcom\'s Website</string>
-    <string name="dexcom_user">Dexcom Account Login</string>
-    <string name="dexcom_login_password">Your password for Dexcom\'s Website</string>
-    <string name="dexcom_password">Dexcom Account Password</string>
+    <string name="usa_based_account">Dex USA based account</string>
+    <string name="dexcom_login">Your login for Dex share</string>
+    <string name="dexcom_user">Dex Account Login</string>
+    <string name="dexcom_login_password">Your password for Dex share</string>
+    <string name="dexcom_password">Dex Account Password</string>
     <string name="dexcom_receiver_serial">10-Character Dexcom Receiver serial number</string>
     <string name="dexcom_test_mode_serial">10-Character Test Mode serial number</string>
     <string name="glucose_meters">Glucose Meters</string>

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" />
-                <Preference
-                    android:dependency="share_upload"
-                    android:summary="@string/manage_existing_followers"
-                    android:key="manage_dexcom_share_followers"
-                    android:title="@string/manage_followers">
-                    <intent
-                        android:action="android.intent.action.MAIN"
-                        android:targetClass="com.eveningoutpost.dexdrip.FollowerManagementActivity"
-                        android:targetPackage="@string/local_target_package" />
-                </Preference>
             </PreferenceScreen>
             <PreferenceScreen
                 android:key="tidepool_upload_screen"