Cleanup: introduced ServiceMeasurementUUID.

Part of #1352.

src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothUtilsTest.java

@@ -18,7 +18,7 @@ public class BluetoothUtilsTest {
     @Test
     public void parseHeartRate_uint8() {
         // given
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEART_RATE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEARTRATE.getServiceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x02, 0x3C});
 
         // when
@@ -31,7 +31,7 @@ public class BluetoothUtilsTest {
     @Test
     public void parseHeartRate_uint16() {
         // given
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEART_RATE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.HEARTRATE.getServiceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x01, 0x01, 0x01});
 
         // when
@@ -43,7 +43,7 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseCyclingSpeedCadence_crankOnly() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x02, (byte) 0xC8, 0x00, 0x00, 0x00, 0x06, (byte) 0x99});
 
         // when
@@ -56,7 +56,7 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseCyclingSpeedCadence_wheelOnly() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x01, (byte) 0xFF, (byte) 0xFF, 0, 1, 0x45, (byte) 0x99});
 
         // when
@@ -69,7 +69,7 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseCyclingSpeedCadence_crankWheel() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_SPEED_CADENCE.getServiceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0x03, (byte) 0xC8, 0x00, 0x00, 0x01, 0x06, (byte) 0x99, (byte) 0xE1, 0x00, 0x45, (byte) 0x99});
 
         // when
@@ -82,7 +82,7 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseCyclingPower_power() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER_MEASUREMENT_CHAR_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.CYCLING_POWER.getServiceUUID(), 0, 0);
         characteristic.setValue(new byte[]{0, 0, 40, 0});
 
         // when
@@ -94,7 +94,7 @@ public class BluetoothUtilsTest {
 
     @Test
     public void parseRunningSpeedAndCadence_with_distance() {
-        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_CHAR_UUID, 0, 0);
+        BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothUtils.RUNNING_SPEED_CADENCE.getServiceUUID(), 0, 0);
         characteristic.setValue(new byte[]{2, 0, 5, 80, (byte) 0xFF, (byte) 0xFF, 0, 1});
 
         // when

src/main/java/de/dennisguse/opentracks/sensors/BluetoothConnectionManager.java

@@ -30,8 +30,6 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-import java.util.UUID;
-
 import de.dennisguse.opentracks.data.models.Cadence;
 import de.dennisguse.opentracks.data.models.HeartRate;
 import de.dennisguse.opentracks.data.models.Power;
@@ -51,8 +49,7 @@ public abstract class BluetoothConnectionManager<DataType> {
 
     private final SensorDataObserver observer;
 
-    private final UUID serviceUUUID;
+    private final ServiceMeasurementUUID sensor;
-    private final UUID measurementUUID;
     private BluetoothGatt bluetoothGatt;
 
     private final BluetoothGattCallback connectCallback = new BluetoothGattCallback() {
@@ -81,15 +78,15 @@ public abstract class BluetoothConnectionManager<DataType> {
 
         @Override
         public void onServicesDiscovered(@NonNull BluetoothGatt gatt, int status) {
-            BluetoothGattService service = gatt.getService(serviceUUUID);
+            BluetoothGattService service = gatt.getService(sensor.getServiceUUID());
             if (service == null) {
-                Log.e(TAG, "Could not get service for address=" + gatt.getDevice().getAddress() + " serviceUUID=" + serviceUUUID);
+                Log.e(TAG, "Could not get service for address=" + gatt.getDevice().getAddress() + " serviceUUID=" + sensor);
                 return;
             }
 
-            BluetoothGattCharacteristic characteristic = service.getCharacteristic(measurementUUID);
+            BluetoothGattCharacteristic characteristic = service.getCharacteristic(sensor.getMeasurementUUID());
             if (characteristic == null) {
-                Log.e(TAG, "Could not get BluetoothCharacteristic for address=" + gatt.getDevice().getAddress() + " serviceUUID=" + serviceUUUID + " characteristicUUID=" + measurementUUID);
+                Log.e(TAG, "Could not get BluetoothCharacteristic for address=" + gatt.getDevice().getAddress() + " serviceUUID=" + sensor + " characteristicUUID=" + sensor.getMeasurementUUID());
                 return;
             }
             gatt.setCharacteristicNotification(characteristic, true);
@@ -122,9 +119,8 @@ public abstract class BluetoothConnectionManager<DataType> {
         }
     };
 
-    BluetoothConnectionManager(UUID serviceUUUID, UUID measurementUUID, SensorDataObserver observer) {
+    BluetoothConnectionManager(ServiceMeasurementUUID serviceUUUID, SensorDataObserver observer) {
-        this.serviceUUUID = serviceUUUID;
+        this.sensor = serviceUUUID;
-        this.measurementUUID = measurementUUID;
         this.observer = observer;
     }
 
@@ -177,7 +173,7 @@ public abstract class BluetoothConnectionManager<DataType> {
     public static class HeartRateConnectionManager extends BluetoothConnectionManager<HeartRate> {
 
         HeartRateConnectionManager(@NonNull SensorDataObserver observer) {
-            super(BluetoothUtils.HEART_RATE_SERVICE_UUID, BluetoothUtils.HEART_RATE_MEASUREMENT_CHAR_UUID, observer);
+            super(BluetoothUtils.HEARTRATE, observer);
         }
 
         @Override
@@ -196,7 +192,7 @@ public abstract class BluetoothConnectionManager<DataType> {
     public static class CyclingCadence extends BluetoothConnectionManager<Cadence> {
 
         CyclingCadence(SensorDataObserver observer) {
-            super(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, BluetoothUtils.CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID, observer);
+            super(BluetoothUtils.CYCLING_SPEED_CADENCE, observer);
         }
 
         @Override
@@ -222,7 +218,7 @@ public abstract class BluetoothConnectionManager<DataType> {
     public static class CyclingDistanceSpeed extends BluetoothConnectionManager<SensorDataCycling.DistanceSpeed.Data> {
 
         CyclingDistanceSpeed(SensorDataObserver observer) {
-            super(BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID, BluetoothUtils.CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID, observer);
+            super(BluetoothUtils.CYCLING_SPEED_CADENCE, observer);
         }
 
         @Override
@@ -248,7 +244,7 @@ public abstract class BluetoothConnectionManager<DataType> {
     public static class CyclingPower extends BluetoothConnectionManager<Power> {
 
         CyclingPower(@NonNull SensorDataObserver observer) {
-            super(BluetoothUtils.CYCLING_POWER_UUID, BluetoothUtils.CYCLING_POWER_MEASUREMENT_CHAR_UUID, observer);
+            super(BluetoothUtils.CYCLING_POWER, observer);
         }
 
         @Override
@@ -267,7 +263,7 @@ public abstract class BluetoothConnectionManager<DataType> {
     public static class RunningSpeedAndCadence extends BluetoothConnectionManager<SensorDataRunning.Data> {
 
         RunningSpeedAndCadence(@NonNull SensorDataObserver observer) {
-            super(BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_UUID, BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_CHAR_UUID, observer);
+            super(BluetoothUtils.RUNNING_SPEED_CADENCE, observer);
         }
 
         @Override

src/main/java/de/dennisguse/opentracks/sensors/BluetoothUtils.java

@@ -43,23 +43,34 @@ public class BluetoothUtils {
 
     public static final UUID CLIENT_CHARACTERISTIC_CONFIG_UUID = new UUID(0x290200001000L, 0x800000805f9b34fbL);
 
-    public static final UUID HEART_RATE_SERVICE_UUID = new UUID(0x180D00001000L, 0x800000805f9b34fbL);
+    public static final ServiceMeasurementUUID HEARTRATE = new ServiceMeasurementUUID(
-    public static final UUID HEART_RATE_MEASUREMENT_CHAR_UUID = new UUID(0x2A3700001000L, 0x800000805f9b34fbL);
+            new UUID(0x180D00001000L, 0x800000805f9b34fbL),
+            new UUID(0x2A3700001000L, 0x800000805f9b34fbL)
+    );
 
-    public static final List<UUID> HEART_RATE_SUPPORTING_DEVICES = Collections.unmodifiableList(Arrays.asList(
+    public static final List<ServiceMeasurementUUID> HEART_RATE_SUPPORTING_DEVICES = Collections.unmodifiableList(Arrays.asList(
-            BluetoothUtils.HEART_RATE_SERVICE_UUID,
+            HEARTRATE,
             //Devices that support HEART_RATE_SERVICE_UUID, but do not announce HEART_RATE_SERVICE_UUID in there BLE announcement messages (during device discovery).
-            UUID.fromString("0000fee0-0000-1000-8000-00805f9b34fb") //Miband3
+            new ServiceMeasurementUUID(
-    ));
+                    UUID.fromString("0000fee0-0000-1000-8000-00805f9b34fb"), //Miband3
+                    HEARTRATE.getMeasurementUUID()
+            ))
+    );
 
-    public static final UUID CYCLING_POWER_UUID = new UUID(0x181800001000L, 0x800000805f9b34fbL);
+    public static final ServiceMeasurementUUID CYCLING_POWER = new ServiceMeasurementUUID(
-    public static final UUID CYCLING_POWER_MEASUREMENT_CHAR_UUID = new UUID(0x2A6300001000L, 0x800000805f9b34fbL);
+            new UUID(0x181800001000L, 0x800000805f9b34fbL),
+            new UUID(0x2A6300001000L, 0x800000805f9b34fbL)
+    );
 
-    public static final UUID CYCLING_SPEED_CADENCE_SERVICE_UUID = new UUID(0x181600001000L, 0x800000805f9b34fbL);
+    public static final ServiceMeasurementUUID CYCLING_SPEED_CADENCE = new ServiceMeasurementUUID(
-    public static final UUID CYCLING_SPEED_CADENCE_MEASUREMENT_CHAR_UUID = new UUID(0x2A5B00001000L, 0x800000805f9b34fbL);
+            new UUID(0x181600001000L, 0x800000805f9b34fbL),
+            new UUID(0x2A5B00001000L, 0x800000805f9b34fbL)
+    );
 
-    public static final UUID RUNNING_RUNNING_SPEED_CADENCE_UUID = new UUID(0x181400001000L, 0x800000805f9b34fbL);
+    public static final ServiceMeasurementUUID RUNNING_SPEED_CADENCE = new ServiceMeasurementUUID(
-    public static final UUID RUNNING_RUNNING_SPEED_CADENCE_CHAR_UUID = new UUID(0x2A5300001000L, 0x800000805f9b34fbL);
+            new UUID(0x181400001000L, 0x800000805f9b34fbL),
+            new UUID(0x2A5300001000L, 0x800000805f9b34fbL)
+    );
 
     private static final String TAG = BluetoothUtils.class.getSimpleName();
 

src/main/java/de/dennisguse/opentracks/sensors/ServiceMeasurementUUID.java

@@ -0,0 +1,47 @@
+package de.dennisguse.opentracks.sensors;
+
+import androidx.annotation.NonNull;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public class ServiceMeasurementUUID {
+
+    private final UUID serviceUUID;
+    private final UUID measurementUUID;
+
+    public ServiceMeasurementUUID(UUID serviceUUID, UUID measurementUUID) {
+        this.serviceUUID = serviceUUID;
+        this.measurementUUID = measurementUUID;
+    }
+
+    public UUID getServiceUUID() {
+        return serviceUUID;
+    }
+
+    public UUID getMeasurementUUID() {
+        return measurementUUID;
+    }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return "ServiceMeasurementUUID{" +
+                "serviceUUID=" + serviceUUID +
+                ", measurementUUID=" + measurementUUID +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ServiceMeasurementUUID that = (ServiceMeasurementUUID) o;
+        return Objects.equals(serviceUUID, that.serviceUUID) && Objects.equals(measurementUUID, that.measurementUUID);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(serviceUUID, measurementUUID);
+    }
+}

src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeCyclingCadenceAndSpeedPreference.java

@@ -27,6 +27,6 @@ public class BluetoothLeCyclingCadenceAndSpeedPreference extends BluetoothLeSens
 
     @Override
     public PreferenceDialogFragmentCompat createInstance() {
-        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.CYCLING_SPEED_CADENCE_SERVICE_UUID);
+        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.CYCLING_SPEED_CADENCE);
     }
 }

src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeCyclingPowerPreference.java

@@ -27,6 +27,6 @@ public class BluetoothLeCyclingPowerPreference extends BluetoothLeSensorPreferen
 
     @Override
     public PreferenceDialogFragmentCompat createInstance() {
-        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.CYCLING_POWER_UUID);
+        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.CYCLING_POWER);
     }
 }

src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeRunningSpeedAndCadencePreference.java

@@ -27,6 +27,6 @@ public class BluetoothLeRunningSpeedAndCadencePreference extends BluetoothLeSens
 
     @Override
     public PreferenceDialogFragmentCompat createInstance() {
-        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.RUNNING_RUNNING_SPEED_CADENCE_UUID);
+        return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothUtils.RUNNING_SPEED_CADENCE);
     }
 }

src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeSensorPreference.java

@@ -23,11 +23,11 @@ import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.UUID;
 import java.util.stream.Collectors;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.sensors.BluetoothUtils;
+import de.dennisguse.opentracks.sensors.ServiceMeasurementUUID;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.util.PermissionRequester;
 
@@ -125,15 +125,18 @@ public abstract class BluetoothLeSensorPreference extends DialogPreference {
             }
         };
 
-        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, UUID sensorUUID) {
+        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, ServiceMeasurementUUID sensorUUID) {
             return newInstance(preferenceKey, Collections.singletonList(sensorUUID));
         }
 
-        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, List<UUID> sensorUUIDs) {
+        public static BluetoothLeSensorPreferenceDialog newInstance(String preferenceKey, List<ServiceMeasurementUUID> sensorUUIDs) {
             final BluetoothLeSensorPreferenceDialog fragment = new BluetoothLeSensorPreferenceDialog();
             final Bundle b = new Bundle(1);
             b.putString(ARG_KEY, preferenceKey);
-            b.putParcelableArrayList(ARG_BLE_SERVICE_UUIDS, new ArrayList<>(sensorUUIDs.stream().map(ParcelUuid::new).collect(Collectors.toList())));
+            b.putParcelableArrayList(ARG_BLE_SERVICE_UUIDS, new ArrayList<>(sensorUUIDs.stream()
+                    .map(ServiceMeasurementUUID::getServiceUUID)
+                    .map(ParcelUuid::new)
+                    .collect(Collectors.toList())));
             fragment.setArguments(b);
             return fragment;
         }