diff --git a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java index 48f3144b0..32173ede3 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java @@ -65,7 +65,7 @@ import de.dennisguse.opentracks.data.models.TrackBuilder; import de.dennisguse.opentracks.data.models.TrackPoint; import de.dennisguse.opentracks.io.file.TrackFileFormat; import de.dennisguse.opentracks.io.file.exporter.TrackExporter; -import de.dennisguse.opentracks.sensors.BluetoothHandlerManagerCyclingPower; +import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingPower; import de.dennisguse.opentracks.sensors.sensorData.Aggregator; import de.dennisguse.opentracks.sensors.sensorData.AggregatorBarometer; import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingCadence; @@ -649,7 +649,7 @@ public class ExportImportTest { SensorDataAggregator sensorDataAggregator = trackPointCreator.getSensorManager().sensorDataAggregator; AggregatorCyclingPower cyclingPower = new AggregatorCyclingPower("", ""); - cyclingPower.add(new Raw<>(trackPointCreator.createNow(), new BluetoothHandlerManagerCyclingPower.Data(Power.of(power), null))); + cyclingPower.add(new Raw<>(trackPointCreator.createNow(), new BluetoothHandlerCyclingPower.Data(Power.of(power), null))); sensorDataAggregator.add(cyclingPower); diff --git a/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingPowerTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingPowerTest.java index 2f4d56e14..494a1705e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingPowerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingPowerTest.java @@ -10,11 +10,11 @@ public class BluetoothHandlerCyclingPowerTest { @Test public void parseCyclingPower_power() { - BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothHandlerManagerCyclingPower.CYCLING_POWER.serviceUUID(), 0, 0); + BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothHandlerCyclingPower.CYCLING_POWER.serviceUUID(), 0, 0); characteristic.setValue(new byte[]{0, 0, 40, 0}); // when - BluetoothHandlerManagerCyclingPower.Data powerCadence = BluetoothHandlerManagerCyclingPower.parseCyclingPower(characteristic); + BluetoothHandlerCyclingPower.Data powerCadence = BluetoothHandlerCyclingPower.parseCyclingPower(characteristic); // then assertEquals(40, powerCadence.power().getW(), 0.01); @@ -22,11 +22,11 @@ public class BluetoothHandlerCyclingPowerTest { @Test public void parseCyclingPower_power_with_cadence() { - BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothHandlerManagerCyclingPower.CYCLING_POWER.serviceUUID(), 0, 0); + BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothHandlerCyclingPower.CYCLING_POWER.serviceUUID(), 0, 0); characteristic.setValue(new byte[]{0x2C, 0x00, 0x00, 0x00, (byte) 0x9F, 0x00, 0x0C, 0x00, (byte) 0xE5, 0x42}); // when - BluetoothHandlerManagerCyclingPower.Data powerCadence = BluetoothHandlerManagerCyclingPower.parseCyclingPower(characteristic); + BluetoothHandlerCyclingPower.Data powerCadence = BluetoothHandlerCyclingPower.parseCyclingPower(characteristic); // then assertEquals(0, powerCadence.power().getW(), 0.01); diff --git a/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRateTest.java b/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerHeartRateTest.java similarity index 65% rename from src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRateTest.java rename to src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerHeartRateTest.java index 55fecb1d5..6cbfaa2d8 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRateTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/sensors/BluetoothHandlerHeartRateTest.java @@ -8,16 +8,16 @@ import org.junit.Test; import de.dennisguse.opentracks.data.models.HeartRate; -public class BluetoothHandlerManagerHeartRateTest { +public class BluetoothHandlerHeartRateTest { @Test public void parseHeartRate_uint8() { // given - BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothHandlerManagerHeartRate.HEARTRATE.serviceUUID(), 0, 0); + BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothHandlerHeartRate.HEARTRATE.serviceUUID(), 0, 0); characteristic.setValue(new byte[]{0x02, 0x3C}); // when - HeartRate heartRate = BluetoothHandlerManagerHeartRate.parseHeartRate(characteristic); + HeartRate heartRate = BluetoothHandlerHeartRate.parseHeartRate(characteristic); // then assertEquals(HeartRate.of(60), heartRate); @@ -26,11 +26,11 @@ public class BluetoothHandlerManagerHeartRateTest { @Test public void parseHeartRate_uint16() { // given - BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothHandlerManagerHeartRate.HEARTRATE.serviceUUID(), 0, 0); + BluetoothGattCharacteristic characteristic = new BluetoothGattCharacteristic(BluetoothHandlerHeartRate.HEARTRATE.serviceUUID(), 0, 0); characteristic.setValue(new byte[]{0x01, 0x01, 0x01}); // when - HeartRate heartRate = BluetoothHandlerManagerHeartRate.parseHeartRate(characteristic); + HeartRate heartRate = BluetoothHandlerHeartRate.parseHeartRate(characteristic); // then assertEquals(HeartRate.of(257), heartRate); diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingCadence.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingCadence.java index 9fee7dcca..64ba0e0b5 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingCadence.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingCadence.java @@ -14,7 +14,7 @@ public class BluetoothHandlerCyclingCadence implements SensorHandlerInterface { private static final String TAG = BluetoothHandlerCyclingCadence.class.getSimpleName(); public static final List CYCLING_CADENCE = List.of( - BluetoothHandlerManagerCyclingPower.CYCLING_POWER, + BluetoothHandlerCyclingPower.CYCLING_POWER, BluetoothHandlerCyclingDistanceSpeed.CYCLING_SPEED_CADENCE ); @@ -30,8 +30,8 @@ public class BluetoothHandlerCyclingCadence implements SensorHandlerInterface { @Override public void handlePayload(SensorManager.SensorDataChangedObserver observer, ServiceMeasurementUUID serviceMeasurementUUID, String sensorName, String address, BluetoothGattCharacteristic characteristic) { - if (serviceMeasurementUUID.equals(BluetoothHandlerManagerCyclingPower.CYCLING_POWER)) { - BluetoothHandlerManagerCyclingPower.Data data = BluetoothHandlerManagerCyclingPower.parseCyclingPower(characteristic); + if (serviceMeasurementUUID.equals(BluetoothHandlerCyclingPower.CYCLING_POWER)) { + BluetoothHandlerCyclingPower.Data data = BluetoothHandlerCyclingPower.parseCyclingPower(characteristic); if (data != null && data.crank() != null) { observer.onChange(new Raw<>(observer.getNow(), data.crank())); } diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerCyclingPower.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingPower.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerCyclingPower.java rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingPower.java index 8105a402b..126bea6b0 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerCyclingPower.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerCyclingPower.java @@ -13,7 +13,7 @@ import de.dennisguse.opentracks.sensors.sensorData.AggregatorCyclingPower; import de.dennisguse.opentracks.sensors.sensorData.Raw; import de.dennisguse.opentracks.sensors.sensorData.SensorHandlerInterface; -public class BluetoothHandlerManagerCyclingPower implements SensorHandlerInterface { +public class BluetoothHandlerCyclingPower implements SensorHandlerInterface { public static final ServiceMeasurementUUID CYCLING_POWER = new ServiceMeasurementUUID( new UUID(0x181800001000L, 0x800000805f9b34fbL), diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRate.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerHeartRate.java similarity index 97% rename from src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRate.java rename to src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerHeartRate.java index 76345b18f..7294b3136 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerManagerHeartRate.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothHandlerHeartRate.java @@ -13,7 +13,7 @@ import de.dennisguse.opentracks.sensors.sensorData.AggregatorHeartRate; import de.dennisguse.opentracks.sensors.sensorData.Raw; import de.dennisguse.opentracks.sensors.sensorData.SensorHandlerInterface; -public class BluetoothHandlerManagerHeartRate implements SensorHandlerInterface { +public class BluetoothHandlerHeartRate implements SensorHandlerInterface { public static final ServiceMeasurementUUID HEARTRATE = new ServiceMeasurementUUID( new UUID(0x180D00001000L, 0x800000805f9b34fbL), diff --git a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java index 8f919fca2..301cbccdb 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/BluetoothRemoteSensorManager.java @@ -57,10 +57,10 @@ public class BluetoothRemoteSensorManager implements SensorConnector, SharedPref this.handler = handler; BluetoothAdapter bluetoothAdapter = BluetoothUtils.getAdapter(context); - this.heartRate = new BluetoothConnectionManager(bluetoothAdapter, observer, new BluetoothHandlerManagerHeartRate()); + this.heartRate = new BluetoothConnectionManager(bluetoothAdapter, observer, new BluetoothHandlerHeartRate()); this.cyclingCadence = new BluetoothConnectionManager(bluetoothAdapter, observer, new BluetoothHandlerCyclingCadence()); this.cyclingSpeed = new BluetoothConnectionManager(bluetoothAdapter, observer, new BluetoothHandlerCyclingDistanceSpeed()); - this.cyclingPower = new BluetoothConnectionManager(bluetoothAdapter, observer, new BluetoothHandlerManagerCyclingPower()); + this.cyclingPower = new BluetoothConnectionManager(bluetoothAdapter, observer, new BluetoothHandlerCyclingPower()); this.runningSpeedAndCadence = new BluetoothConnectionManager(bluetoothAdapter, observer, new BluetoothHandlerRunningSpeedAndCadence()); } diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java index ca6dd78bd..c8050ec69 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/AggregatorCyclingPower.java @@ -3,16 +3,16 @@ package de.dennisguse.opentracks.sensors.sensorData; import androidx.annotation.NonNull; import de.dennisguse.opentracks.data.models.Power; -import de.dennisguse.opentracks.sensors.BluetoothHandlerManagerCyclingPower; +import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingPower; -public class AggregatorCyclingPower extends Aggregator { +public class AggregatorCyclingPower extends Aggregator { public AggregatorCyclingPower(String name, String address) { super(name, address); } @Override - public void computeValue(Raw current) { + public void computeValue(Raw current) { this.aggregatedValue = current.value().power(); } diff --git a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataAggregator.java b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataAggregator.java index 6787a3e3a..89fe0bc7c 100644 --- a/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataAggregator.java +++ b/src/main/java/de/dennisguse/opentracks/sensors/sensorData/SensorDataAggregator.java @@ -16,7 +16,7 @@ import de.dennisguse.opentracks.data.models.Position; import de.dennisguse.opentracks.data.models.Speed; import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingCadence; import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingDistanceSpeed; -import de.dennisguse.opentracks.sensors.BluetoothHandlerManagerCyclingPower; +import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingPower; import de.dennisguse.opentracks.sensors.BluetoothHandlerRunningSpeedAndCadence; import de.dennisguse.opentracks.settings.PreferencesUtils; @@ -119,8 +119,8 @@ public class SensorDataAggregator { return; } - if (value instanceof BluetoothHandlerManagerCyclingPower.Data) { - this.cyclingPower.add((Raw) data); + if (value instanceof BluetoothHandlerCyclingPower.Data) { + this.cyclingPower.add((Raw) data); return; } if (value instanceof AtmosphericPressure) { diff --git a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeCyclingPowerPreference.java b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeCyclingPowerPreference.java index 4873687c0..ff99809cd 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeCyclingPowerPreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeCyclingPowerPreference.java @@ -7,7 +7,7 @@ import androidx.preference.PreferenceDialogFragmentCompat; import java.util.List; -import de.dennisguse.opentracks.sensors.BluetoothHandlerManagerCyclingPower; +import de.dennisguse.opentracks.sensors.BluetoothHandlerCyclingPower; public class BluetoothLeCyclingPowerPreference extends BluetoothLeSensorPreference { @@ -29,6 +29,6 @@ public class BluetoothLeCyclingPowerPreference extends BluetoothLeSensorPreferen @Override public PreferenceDialogFragmentCompat createInstance() { - return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), List.of(BluetoothHandlerManagerCyclingPower.CYCLING_POWER)); + return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), List.of(BluetoothHandlerCyclingPower.CYCLING_POWER)); } } \ No newline at end of file diff --git a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeHeartRatePreference.java b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeHeartRatePreference.java index 17183bf53..97a447ddd 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeHeartRatePreference.java +++ b/src/main/java/de/dennisguse/opentracks/settings/bluetooth/BluetoothLeHeartRatePreference.java @@ -5,7 +5,7 @@ import android.util.AttributeSet; import androidx.preference.PreferenceDialogFragmentCompat; -import de.dennisguse.opentracks.sensors.BluetoothHandlerManagerHeartRate; +import de.dennisguse.opentracks.sensors.BluetoothHandlerHeartRate; public class BluetoothLeHeartRatePreference extends BluetoothLeSensorPreference { @@ -27,6 +27,6 @@ public class BluetoothLeHeartRatePreference extends BluetoothLeSensorPreference @Override public PreferenceDialogFragmentCompat createInstance() { - return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothHandlerManagerHeartRate.HEART_RATE_SUPPORTING_DEVICES); + return BluetoothLeSensorPreference.BluetoothLeSensorPreferenceDialog.newInstance(getKey(), BluetoothHandlerHeartRate.HEART_RATE_SUPPORTING_DEVICES); } } \ No newline at end of file