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

Author: jamorham

app/src/main/java/com/eveningoutpost/dexdrip/NewSensorLocation.java

@@ -116,7 +116,7 @@ public void onClick(View v) {
 
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
-                prefs.edit().putBoolean("store_sensor_location", !DontAskAgain.isChecked()).apply();
+            //    prefs.edit().putBoolean("store_sensor_location", !DontAskAgain.isChecked()).apply();
 
                 Intent intent = new Intent(getApplicationContext(), Home.class);
                 startActivity(intent);
@@ -129,7 +129,7 @@ public void onClick(View v) {
 
                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
 
-                prefs.edit().putBoolean("store_sensor_location", !DontAskAgain.isChecked()).apply();
+            //    prefs.edit().putBoolean("store_sensor_location", !DontAskAgain.isChecked()).apply();
 
                 Intent intent = new Intent(getApplicationContext(), Home.class);
                 startActivity(intent);

app/src/main/java/com/eveningoutpost/dexdrip/StartNewSensor.java

@@ -224,11 +224,7 @@ private void startSensorAndSetIntent() {
         startSensorForTime(startTime);
 
         Intent intent;
-        if (Pref.getBoolean("store_sensor_location", false) && Experience.gotData()) {
-            intent = new Intent(getApplicationContext(), NewSensorLocation.class);
-        } else {
-            intent = new Intent(getApplicationContext(), Home.class);
-        }
+        intent = new Intent(getApplicationContext(), Home.class);
 
         startActivity(intent);
         finish();

app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/IdempotentMigrations.java

@@ -157,6 +157,7 @@ private static void legacySettingsFix() {
         Pref.setBoolean("run_ble_scan_constantly", false);
         Pref.setBoolean("run_G5_ble_tasks_on_uithread", false);
         Pref.setBoolean("ob1_initiate_bonding_flag", true);
+        Pref.setBoolean("store_sensor_location", false);
     }
     private static void legacySettingsMoveLanguageFromNoToNb() {
         // Check if the user's language preference is set to "no"