From 54ff94f905fb2fe5eec6c49fe465357504099255 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Mon, 18 Nov 2019 17:16:50 +0100
Subject: [PATCH] Settings: renamed Bluetooth sensor to "Heart rate".

---
 .../services/sensors/BluetoothRemoteSensorManager.java      | 6 +++---
 .../de/dennisguse/opentracks/settings/SettingsActivity.java | 2 +-
 src/main/java/de/dennisguse/opentracks/util/StatsUtils.java | 2 +-
 src/main/res/values/settings.xml                            | 2 +-
 src/main/res/xml/settings.xml                               | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java
index dd452e3a3..5f9a1b94a 100644
--- a/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java
+++ b/src/main/java/de/dennisguse/opentracks/services/sensors/BluetoothRemoteSensorManager.java
@@ -85,8 +85,8 @@ public class BluetoothRemoteSensorManager {
     private final SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
-            if (bluetoothConnectionManager != null && PreferencesUtils.isKey(context, R.string.settings_sensor_bluetooth_sensor_key, key)) {
-                String address = PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+            if (bluetoothConnectionManager != null && PreferencesUtils.isKey(context, R.string.settings_sensor_bluetooth_heart_rate_key, key)) {
+                String address = PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_heart_rate_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
                 if (address.equals(PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT)) {
                     stop();
                     return;
@@ -145,7 +145,7 @@ public class BluetoothRemoteSensorManager {
             return;
         }
 
-        String address = PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
+        String address = PreferencesUtils.getString(context, R.string.settings_sensor_bluetooth_heart_rate_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT);
         if (PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT.equals(address)) {
             Log.w(TAG, "No bluetooth address.");
             return;
diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index 120594caf..b8a9fb6c3 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -157,7 +157,7 @@ public class SettingsActivity extends AppCompatActivity implements ChooseActivit
 
         private void updateBluetooth() {
             // Disable Bluetooth preference if device does not have Bluetooth
-            BluetoothLeListPreference bluetoothPreference = findPreference(getString(R.string.settings_sensor_bluetooth_sensor_key));
+            BluetoothLeListPreference bluetoothPreference = findPreference(getString(R.string.settings_sensor_bluetooth_heart_rate_key));
             bluetoothPreference.setVisible(BluetoothUtils.hasBluetooth(TAG));
         }
 
diff --git a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
index b0d495490..3d9de4318 100644
--- a/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/util/StatsUtils.java
@@ -108,7 +108,7 @@ public class StatsUtils {
     public static void setSensorData(Activity activity, SensorDataSet sensorDataSet, boolean isRecording) {
         // heart rate
         int isVisible = View.VISIBLE;
-        if (!isRecording || PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT.equals(PreferencesUtils.getString(activity, R.string.settings_sensor_bluetooth_sensor_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT))) {
+        if (!isRecording || PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT.equals(PreferencesUtils.getString(activity, R.string.settings_sensor_bluetooth_heart_rate_key, PreferencesUtils.BLUETOOTH_SENSOR_DEFAULT))) {
             isVisible = View.INVISIBLE;
         }
         activity.findViewById(R.id.stats_sensor_container).setVisibility(isVisible);
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index bcee76bf8..f655c6f3f 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -27,7 +27,7 @@
 
     <string name="settings_reset_key" translatable="false">settingsReset</string>
 
-    <string name="settings_sensor_bluetooth_sensor_key" translatable="false">bluetoothSensor</string>
+    <string name="settings_sensor_bluetooth_heart_rate_key" translatable="false">bluetoothSensor</string>
     <string name="sensor_type_value_none" translatable="false">NONE</string>
 
     <string name="default_activity_key" translatable="false">defaultActivity</string>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index ef9cdc2bd..6e9eacd32 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -129,11 +129,11 @@ limitations under the License.
             android:title="@string/settings_recording_default_activity_title" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/settings_sensor">
+    <PreferenceCategory android:title="@string/settings_sensor_bluetooth">
         <de.dennisguse.opentracks.settings.BluetoothLeListPreference
             android:defaultValue="@string/sensor_type_value_none"
-            android:key="@string/settings_sensor_bluetooth_sensor_key"
-            android:title="@string/settings_sensor_bluetooth_sensor" />
+            android:key="@string/settings_sensor_bluetooth_heart_rate_key"
+            android:title="@string/sensor_state_heart_rate" />
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/generic_tracks">