karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Finished renaming: TrackPointCreator was still referenced as HandlerServer.

Browse Source
This commit is contained in:
Dennis Guse
2021-08-29 12:23:14 +02:00
parent fa02ba9c69
commit 9cb3d8c1bb
9 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java
+20 -20
View File
@@ -112,41 +112,41 @@ public class ExportImportTest {
TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class))) TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
.getService(); .getService();
service.getHandlerServer().setClock(Clock.systemUTC()); service.getTrackPointCreator().setClock(Clock.systemUTC());
} }
public void setUp(boolean hasSensorDistance) throws TimeoutException { public void setUp(boolean hasSensorDistance) throws TimeoutException {
TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class))) TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class)))
.getService(); .getService();
TrackPointCreator handlerServer = service.getHandlerServer(); TrackPointCreator trackPointCreator = service.getTrackPointCreator();
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
trackId = service.startNewTrack(); trackId = service.startNewTrack();
Distance sensorDistance = hasSensorDistance ? Distance.of(5) : null; Distance sensorDistance = hasSensorDistance ? Distance.of(5) : null;
sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:03Z"), 3, 14, 10, 15, 10, 1, 66, 3, 50, sensorDistance); sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:03Z"), 3, 14, 10, 15, 10, 1, 66, 3, 50, sensorDistance);
service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null); service.insertMarker("Marker 1", "Marker 1 category", "Marker 1 desc", null);
sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:04Z"), 3, 14.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance); sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:04Z"), 3, 14.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:05Z"), 3, 14.002, 10, 15, 10, 0, 66, 3, 50, sensorDistance); sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:05Z"), 3, 14.002, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null); service.insertMarker("Marker 2", "Marker 2 category", "Marker 2 desc", null);
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:06Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:06Z"), ZoneId.of("CET")));
handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context)); trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
service.pauseCurrentTrack(); service.pauseCurrentTrack();
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:20Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:20Z"), ZoneId.of("CET")));
service.resumeCurrentTrack(); service.resumeCurrentTrack();
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:21Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:21Z"), ZoneId.of("CET")));
sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:21Z"), 3, 14.003, 10, 15, 10, 0, 66, 3, 50, sensorDistance); sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:21Z"), 3, 14.003, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:22Z"), 3, 16, 10, 15, 10, 0, 66, 3, 50, sensorDistance); sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:22Z"), 3, 16, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
sendLocation(handlerServer, Instant.parse("2020-02-02T02:02:23Z"), 3, 16.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance); sendLocation(trackPointCreator, Instant.parse("2020-02-02T02:02:23Z"), 3, 16.001, 10, 15, 10, 0, 66, 3, 50, sensorDistance);
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:24Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:24Z"), ZoneId.of("CET")));
handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context)); trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context));
service.endCurrentTrack(); service.endCurrentTrack();
Track track = contentProviderUtils.getTrack(trackId); Track track = contentProviderUtils.getTrack(trackId);
@@ -380,7 +380,7 @@ public class ExportImportTest {
} }
} }
private void sendLocation(TrackPointCreator handlerServer, Instant time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain, float heartRate, float cyclingCadence, float power, Distance distance) { private void sendLocation(TrackPointCreator trackPointCreator, Instant time, double latitude, double longitude, float accuracy, float speed, float altitude, float altitudeGain, float heartRate, float cyclingCadence, float power, Distance distance) {
Location location = new Location("mock"); Location location = new Location("mock");
location.setLatitude(latitude); location.setLatitude(latitude);
location.setLongitude(longitude); location.setLongitude(longitude);
@@ -388,7 +388,7 @@ public class ExportImportTest {
location.setSpeed(speed); location.setSpeed(speed);
location.setAltitude(altitude); location.setAltitude(altitude);
handlerServer.setAltitudeSumManager(new AltitudeSumManager() { trackPointCreator.setAltitudeSumManager(new AltitudeSumManager() {
@Override @Override
public void fill(@NonNull TrackPoint trackPoint) { public void fill(@NonNull TrackPoint trackPoint) {
trackPoint.setAltitudeGain(altitudeGain); trackPoint.setAltitudeGain(altitudeGain);
@@ -396,7 +396,7 @@ public class ExportImportTest {
} }
}); });
handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) { trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
@Override @Override
public SensorDataSet fill(@NonNull TrackPoint trackPoint) { public SensorDataSet fill(@NonNull TrackPoint trackPoint) {
SensorDataSet sensorDataSet = new SensorDataSet(); SensorDataSet sensorDataSet = new SensorDataSet();
@@ -422,7 +422,7 @@ public class ExportImportTest {
} }
}); });
handlerServer.setClock(Clock.fixed(time, ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(time, ZoneId.of("CET")));
handlerServer.getLocationHandler().onLocationChanged(location); trackPointCreator.getLocationHandler().onLocationChanged(location);
} }
} }
src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java
+32 -32
View File
@@ -138,7 +138,7 @@ public class TrackRecordingServiceTest {
if (service.isRecording() || service.isPaused()) { if (service.isRecording() || service.isPaused()) {
service.endCurrentTrack(); service.endCurrentTrack();
} }
service.getHandlerServer().setClock(Clock.systemUTC()); service.getTrackPointCreator().setClock(Clock.systemUTC());
// Ensure that the database is empty after every test // Ensure that the database is empty after every test
contentProviderUtils.deleteAllTracks(context); contentProviderUtils.deleteAllTracks(context);
@@ -212,15 +212,15 @@ public class TrackRecordingServiceTest {
TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
.getService(); .getService();
TrackPointCreator handlerServer = service.getHandlerServer(); TrackPointCreator trackPointCreator = service.getTrackPointCreator();
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
handlerServer.stopGPS(); trackPointCreator.stopGPS();
handlerServer.setAltitudeSumManager(altitudeSumManager); trackPointCreator.setAltitudeSumManager(altitudeSumManager);
// when // when
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
service.endCurrentTrack(); service.endCurrentTrack();
// then // then
@@ -242,22 +242,22 @@ public class TrackRecordingServiceTest {
TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
.getService(); .getService();
TrackPointCreator handlerServer = service.getHandlerServer(); TrackPointCreator trackPointCreator = service.getTrackPointCreator();
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
handlerServer.stopGPS(); trackPointCreator.stopGPS();
handlerServer.setAltitudeSumManager(altitudeSumManager); trackPointCreator.setAltitudeSumManager(altitudeSumManager);
// when // when
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
service.pauseCurrentTrack(); service.pauseCurrentTrack();
// then // then
assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount()); assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount());
//when //when
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
service.resumeTrack(trackId); service.resumeTrack(trackId);
// then // then
@@ -281,23 +281,23 @@ public class TrackRecordingServiceTest {
TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
.getService(); .getService();
TrackPointCreator handlerServer = service.getHandlerServer(); TrackPointCreator trackPointCreator = service.getTrackPointCreator();
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
handlerServer.stopGPS(); trackPointCreator.stopGPS();
handlerServer.setAltitudeSumManager(altitudeSumManager); trackPointCreator.setAltitudeSumManager(altitudeSumManager);
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
service.endCurrentTrack(); service.endCurrentTrack();
// when // when
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
service.resumeTrack(trackId); service.resumeTrack(trackId);
handlerServer.stopGPS(); trackPointCreator.stopGPS();
handlerServer.setAltitudeSumManager(altitudeSumManager); trackPointCreator.setAltitudeSumManager(altitudeSumManager);
handlerServer.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z")), Distance.of(50)); trackPointCreator.onNewTrackPoint(new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:05Z")), Distance.of(50));
// then // then
assertTrue(service.isRecording()); assertTrue(service.isRecording());
@@ -323,18 +323,18 @@ public class TrackRecordingServiceTest {
TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
.getService(); .getService();
TrackPointCreator handlerServer = service.getHandlerServer(); TrackPointCreator trackPointCreator = service.getTrackPointCreator();
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
handlerServer.stopGPS(); trackPointCreator.stopGPS();
handlerServer.setAltitudeSumManager(altitudeSumManager); trackPointCreator.setAltitudeSumManager(altitudeSumManager);
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:03Z"), ZoneId.of("CET")));
service.pauseCurrentTrack(); service.pauseCurrentTrack();
// when // when
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:04Z"), ZoneId.of("CET")));
service.endCurrentTrack(); service.endCurrentTrack();
// then // then
@@ -405,14 +405,14 @@ public class TrackRecordingServiceTest {
TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context)))
.getService(); .getService();
TrackPointCreator handlerServer = service.getHandlerServer(); TrackPointCreator trackPointCreator = service.getTrackPointCreator();
handlerServer.stopGPS(); trackPointCreator.stopGPS();
handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET"))); trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:02Z"), ZoneId.of("CET")));
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
assertTrue(service.isRecording()); assertTrue(service.isRecording());
handlerServer.onNewTrackPoint( trackPointCreator.onNewTrackPoint(
new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z")) new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z"))
.setLatitude(10) .setLatitude(10)
.setLongitude(10) .setLongitude(10)
@@ -467,6 +467,6 @@ public class TrackRecordingServiceTest {
.setSpeed(Speed.of(speed)) .setSpeed(Speed.of(speed))
.setBearing(3.0f); .setBearing(3.0f);
trackRecordingService.getHandlerServer().onNewTrackPoint(trackPoint, Distance.of(50)); trackRecordingService.getTrackPointCreator().onNewTrackPoint(trackPoint, Distance.of(50));
} }
} }
src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java
+9 -9
View File
@@ -96,7 +96,7 @@ public class TrackRecordingServiceTestLocation {
service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context))) service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context)))
.getService(); .getService();
service.getHandlerServer().stopGPS(); service.getTrackPointCreator().stopGPS();
} }
@After @After
@@ -110,7 +110,7 @@ public class TrackRecordingServiceTestLocation {
public void testOnLocationChangedAsync_movingAccurate() { public void testOnLocationChangedAsync_movingAccurate() {
// given // given
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
// when // when
TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15); TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -183,7 +183,7 @@ public class TrackRecordingServiceTestLocation {
public void testOnLocationChangedAsync_slowMovingAccurate() { public void testOnLocationChangedAsync_slowMovingAccurate() {
// given // given
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
// when // when
TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15); TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -228,7 +228,7 @@ public class TrackRecordingServiceTestLocation {
public void testOnLocationChangedAsync_idle() { public void testOnLocationChangedAsync_idle() {
// given // given
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
// when // when
TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0); TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
@@ -280,8 +280,8 @@ public class TrackRecordingServiceTestLocation {
public void testOnLocationChangedAsync_idle_withMovement() { public void testOnLocationChangedAsync_idle_withMovement() {
// given // given
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
service.getHandlerServer().stopGPS(); service.getTrackPointCreator().stopGPS();
// when // when
TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15); TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15);
@@ -340,8 +340,8 @@ public class TrackRecordingServiceTestLocation {
public void testOnLocationChangedAsync_idle_withSensorData() { public void testOnLocationChangedAsync_idle_withSensorData() {
// given // given
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
service.getHandlerServer().setRemoteSensorManager(new BluetoothRemoteSensorManager(context) { service.getTrackPointCreator().setRemoteSensorManager(new BluetoothRemoteSensorManager(context) {
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
@@ -435,7 +435,7 @@ public class TrackRecordingServiceTestLocation {
public void testOnLocationChangedAsync_segment() { public void testOnLocationChangedAsync_segment() {
// given // given
Track.Id trackId = service.startNewTrack(); Track.Id trackId = service.startNewTrack();
service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager);
// when // when
TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0); TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0);
src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java
+3 -3
View File
@@ -235,8 +235,8 @@ public class TrackRecordingServiceTestLooper {
// Insert a few points, markers and statistics. // Insert a few points, markers and statistics.
for (int i = 0; i < 30; i++) { for (int i = 0; i < 30; i++) {
//TODO Should send locations to LocationHandler instead of TrackPoints to HandlerServer? //TODO Should send locations to LocationHandler instead of TrackPoints to TrackPointCreator?
TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, service.getHandlerServer().createNow()) TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, service.getTrackPointCreator().createNow())
.setLongitude(35.0f + i / 10.0f) .setLongitude(35.0f + i / 10.0f)
.setLatitude(45.0f - i / 5.0f) .setLatitude(45.0f - i / 5.0f)
.setHorizontalAccuracy(Distance.of(5)) .setHorizontalAccuracy(Distance.of(5))
@@ -244,7 +244,7 @@ public class TrackRecordingServiceTestLooper {
.setBearing(3.0f); .setBearing(3.0f);
Distance prefAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context); Distance prefAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context);
service.getHandlerServer().onNewTrackPoint(trackPoint, prefAccuracy); service.getTrackPointCreator().onNewTrackPoint(trackPoint, prefAccuracy);
if (i % 7 == 0) { if (i % 7 == 0) {
service.insertMarker(null, null, null, null); service.insertMarker(null, null, null, null);
src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java
+6 -6
View File
@@ -33,7 +33,7 @@ public class LocationHandlerTest {
private final SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context); private final SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
@Mock @Mock
private TrackPointCreator handlerServer; private TrackPointCreator trackPointCreator;
@InjectMocks @InjectMocks
private LocationHandler locationHandler; private LocationHandler locationHandler;
@@ -49,7 +49,7 @@ public class LocationHandlerTest {
// Let's use default values. // Let's use default values.
sharedPreferences.edit().clear().commit(); sharedPreferences.edit().clear().commit();
Mockito.when(handlerServer.createNow()) Mockito.when(trackPointCreator.createNow())
.thenReturn(Instant.now()); .thenReturn(Instant.now());
//TODO REMOVE //TODO REMOVE
@@ -67,7 +67,7 @@ public class LocationHandlerTest {
locationHandler.onLocationChanged(createLocation(45f, 35f, 3, 5, System.currentTimeMillis())); locationHandler.onLocationChanged(createLocation(45f, 35f, 3, 5, System.currentTimeMillis()));
// then // then
verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class)); verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
} }
/** /**
@@ -83,7 +83,7 @@ public class LocationHandlerTest {
locationHandler.onLocationChanged(createLocation(latitude, 35f, 3, 5, System.currentTimeMillis())); locationHandler.onLocationChanged(createLocation(latitude, 35f, 3, 5, System.currentTimeMillis()));
// then // then
verify(handlerServer, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class)); verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
} }
/** /**
@@ -99,7 +99,7 @@ public class LocationHandlerTest {
// then // then
// no newTrackPoint called // no newTrackPoint called
verify(handlerServer, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class)); verify(trackPointCreator, times(0)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
} }
@Test @Test
@@ -112,7 +112,7 @@ public class LocationHandlerTest {
locationHandler.onLocationChanged(createLocation(99.0, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis())); locationHandler.onLocationChanged(createLocation(99.0, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis()));
// then // then
verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class)); verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class));
} }
/** /**
src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java
+7 -7
View File
@@ -81,19 +81,19 @@ class TrackRecordingManager {
insertTrackPoint(trackId, segmentStartTrackPoint); insertTrackPoint(trackId, segmentStartTrackPoint);
} }
void pause(TrackPointCreator handlerServer) { void pause(TrackPointCreator trackPointCreator) {
if (lastTrackPoint != null) { if (lastTrackPoint != null) {
insertTrackPointIfNewer(trackId, lastTrackPoint); insertTrackPointIfNewer(trackId, lastTrackPoint);
} }
insertTrackPoint(trackId, handlerServer.createSegmentEnd()); insertTrackPoint(trackId, trackPointCreator.createSegmentEnd());
} }
void end(TrackPointCreator handlerServer) { void end(TrackPointCreator trackPointCreator) {
if (lastTrackPoint != null) { if (lastTrackPoint != null) {
insertTrackPointIfNewer(trackId, lastTrackPoint); insertTrackPointIfNewer(trackId, lastTrackPoint);
} }
TrackPoint segmentEnd = handlerServer.createSegmentEnd(); TrackPoint segmentEnd = trackPointCreator.createSegmentEnd();
insertTrackPoint(trackId, segmentEnd); insertTrackPoint(trackId, segmentEnd);
trackId = null; trackId = null;
@@ -103,12 +103,12 @@ class TrackRecordingManager {
isIdle = false; isIdle = false;
} }
Pair<Track, Pair<TrackPoint, SensorDataSet>> get(TrackPointCreator handlerServer) { Pair<Track, Pair<TrackPoint, SensorDataSet>> get(TrackPointCreator trackPointCreator) {
if (handlerServer == null) { if (trackPointCreator == null) {
return null; return null;
} }
TrackStatisticsUpdater tmpTrackStatisticsUpdater = getTrackStatisticsUpdater(); TrackStatisticsUpdater tmpTrackStatisticsUpdater = getTrackStatisticsUpdater();
Pair<TrackPoint, SensorDataSet> current = handlerServer.createCurrentTrackPoint(lastTrackPoint); Pair<TrackPoint, SensorDataSet> current = trackPointCreator.createCurrentTrackPoint(lastTrackPoint);
tmpTrackStatisticsUpdater.addTrackPoint(current.first, recordingDistanceInterval); tmpTrackStatisticsUpdater.addTrackPoint(current.first, recordingDistanceInterval);
src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java
+18 -18
View File
@@ -112,7 +112,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
} }
handlerServer.onSharedPreferenceChanged(sharedPreferences, key); trackPointCreator.onSharedPreferenceChanged(sharedPreferences, key);
trackRecordingManager.onSharedPreferenceChanged(sharedPreferences, key); trackRecordingManager.onSharedPreferenceChanged(sharedPreferences, key);
} }
}; };
@@ -122,7 +122,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
private final Binder binder = new Binder(); private final Binder binder = new Binder();
private TrackPointCreator handlerServer; //TODO Move to TrackRecordingManager? private TrackPointCreator trackPointCreator; //TODO Move to TrackRecordingManager?
private RecordingStatus recordingStatus; private RecordingStatus recordingStatus;
private MutableLiveData<RecordingStatus> recordingStatusObservable; private MutableLiveData<RecordingStatus> recordingStatusObservable;
@@ -141,7 +141,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
recordingDataObservable = new MutableLiveData<>(NOT_RECORDING); recordingDataObservable = new MutableLiveData<>(NOT_RECORDING);
trackRecordingManager = new TrackRecordingManager(this); trackRecordingManager = new TrackRecordingManager(this);
handlerServer = new TrackPointCreator(this); trackPointCreator = new TrackPointCreator(this);
voiceAnnouncementManager = new VoiceAnnouncementManager(this); voiceAnnouncementManager = new VoiceAnnouncementManager(this);
@@ -166,8 +166,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
public void onDestroy() { public void onDestroy() {
handler = null; handler = null;
handlerServer.stop(); trackPointCreator.stop();
handlerServer = null; trackPointCreator = null;
// Reverse order from onCreate // Reverse order from onCreate
showNotification(false); //TODO Why? showNotification(false); //TODO Why?
@@ -219,7 +219,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
} }
// Set recording status // Set recording status
Track.Id trackId = trackRecordingManager.start(handlerServer.createSegmentStartManual()); Track.Id trackId = trackRecordingManager.start(trackPointCreator.createSegmentStartManual());
updateRecordingStatus(RecordingStatus.record(trackId)); updateRecordingStatus(RecordingStatus.record(trackId));
startRecording(); startRecording();
@@ -233,8 +233,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
* @param trackId the id of the track to be resumed. * @param trackId the id of the track to be resumed.
*/ */
public void resumeTrack(Track.Id trackId) { public void resumeTrack(Track.Id trackId) {
handlerServer.resetSensorData(); trackPointCreator.resetSensorData();
trackRecordingManager.resume(trackId, handlerServer.createSegmentStartManual()); trackRecordingManager.resume(trackId, trackPointCreator.createSegmentStartManual());
// Set recording status // Set recording status
updateRecordingStatus(RecordingStatus.record(trackId)); updateRecordingStatus(RecordingStatus.record(trackId));
@@ -272,7 +272,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
private void startGps() { private void startGps() {
wakeLock = SystemUtils.acquireWakeLock(this, wakeLock); wakeLock = SystemUtils.acquireWakeLock(this, wakeLock);
handlerServer.start(this); trackPointCreator.start(this);
showNotification(true); showNotification(true);
} }
@@ -291,7 +291,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
updateRecordingStatus(STATUS_DEFAULT); updateRecordingStatus(STATUS_DEFAULT);
if (!wasPause) { if (!wasPause) {
trackRecordingManager.end(handlerServer); trackRecordingManager.end(trackPointCreator);
} }
ExportUtils.postWorkoutExport(this, trackId, new ExportServiceResultReceiver(new Handler(), this)); ExportUtils.postWorkoutExport(this, trackId, new ExportServiceResultReceiver(new Handler(), this));
@@ -309,7 +309,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
// Set recording status // Set recording status
updateRecordingStatus(recordingStatus.pause()); updateRecordingStatus(recordingStatus.pause());
trackRecordingManager.pause(handlerServer); trackRecordingManager.pause(trackPointCreator);
endRecording(false); endRecording(false);
@@ -333,7 +333,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
voiceAnnouncementManager.shutdown(); voiceAnnouncementManager.shutdown();
// Update instance variables // Update instance variables
handlerServer.stop(); trackPointCreator.stop();
stopGps(trackStopped); stopGps(trackStopped);
} }
@@ -350,7 +350,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
void stopGps(boolean shutdown) { void stopGps(boolean shutdown) {
if (!isRecording()) return; if (!isRecording()) return;
handlerServer.stop(); trackPointCreator.stop();
showNotification(false); showNotification(false);
wakeLock = SystemUtils.releaseWakeLock(wakeLock); wakeLock = SystemUtils.releaseWakeLock(wakeLock);
if (shutdown) { if (shutdown) {
@@ -410,8 +410,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
@Deprecated @Deprecated
@VisibleForTesting @VisibleForTesting
public TrackPointCreator getHandlerServer() { public TrackPointCreator getTrackPointCreator() {
return handlerServer; return trackPointCreator;
} }
public LiveData<GpsStatusValue> getGpsStatusObservable() { public LiveData<GpsStatusValue> getGpsStatusObservable() {
@@ -430,15 +430,15 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
// Compute temporary track statistics using sensorData and update time. // Compute temporary track statistics using sensorData and update time.
TrackPointCreator localHandlerServer = this.handlerServer; TrackPointCreator localTrackPointCreator = this.trackPointCreator;
VoiceAnnouncementManager localVoiceAnnouncementManager = this.voiceAnnouncementManager; VoiceAnnouncementManager localVoiceAnnouncementManager = this.voiceAnnouncementManager;
if (localHandlerServer == null || localVoiceAnnouncementManager == null) { if (localTrackPointCreator == null || localVoiceAnnouncementManager == null) {
// when this happens, no recording is running and we should not send any notifications. // when this happens, no recording is running and we should not send any notifications.
//TODO This implementation is not a good idea; rather solve the issue for this properly //TODO This implementation is not a good idea; rather solve the issue for this properly
return; return;
} }
Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.get(handlerServer); Pair<Track, Pair<TrackPoint, SensorDataSet>> data = trackRecordingManager.get(trackPointCreator);
if (data == null) { if (data == null) {
Log.w(TAG, "Requesting data if not recording is taking place, should not be done."); Log.w(TAG, "Requesting data if not recording is taking place, should not be done.");
return; return;
src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java
+7 -7
View File
@@ -25,14 +25,14 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
private final String TAG = LocationHandler.class.getSimpleName(); private final String TAG = LocationHandler.class.getSimpleName();
private LocationManager locationManager; private LocationManager locationManager;
private final TrackPointCreator handlerServer; private final TrackPointCreator trackPointCreator;
private GpsStatus gpsStatus; private GpsStatus gpsStatus;
private Duration gpsInterval; private Duration gpsInterval;
private Distance thresholdHorizontalAccuracy; private Distance thresholdHorizontalAccuracy;
private TrackPoint lastTrackPoint; private TrackPoint lastTrackPoint;
public LocationHandler(TrackPointCreator handlerServer) { public LocationHandler(TrackPointCreator trackPointCreator) {
this.handlerServer = handlerServer; this.trackPointCreator = trackPointCreator;
} }
public void onStart(@NonNull Context context, SharedPreferences sharedPreferences) { public void onStart(@NonNull Context context, SharedPreferences sharedPreferences) {
@@ -92,7 +92,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
} }
/** /**
* Checks if location is valid and builds a track point that will be send through HandlerServer. * Checks if location is valid and builds a track point that will be send through TrackPointCreator.
* *
* @param location {@link Location} object. * @param location {@link Location} object.
*/ */
@@ -103,7 +103,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
return; return;
} }
TrackPoint trackPoint = new TrackPoint(location, handlerServer.createNow()); TrackPoint trackPoint = new TrackPoint(location, trackPointCreator.createNow());
boolean isAccurate = trackPoint.fulfillsAccuracy(thresholdHorizontalAccuracy); boolean isAccurate = trackPoint.fulfillsAccuracy(thresholdHorizontalAccuracy);
boolean isValid = LocationUtils.isValidLocation(location); boolean isValid = LocationUtils.isValidLocation(location);
@@ -122,7 +122,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
} }
lastTrackPoint = trackPoint; lastTrackPoint = trackPoint;
handlerServer.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy); trackPointCreator.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy);
} }
@Override @Override
@@ -167,6 +167,6 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
*/ */
@Override @Override
public void onGpsStatusChanged(GpsStatusValue prevStatus, GpsStatusValue currentStatus) { public void onGpsStatusChanged(GpsStatusValue prevStatus, GpsStatusValue currentStatus) {
handlerServer.sendGpsStatus(currentStatus); trackPointCreator.sendGpsStatus(currentStatus);
} }
} }
src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class TrackPointCreator {
altitudeSumManager.reset(); altitudeSumManager.reset();
} }
//TODO TrackPoint should be created by HandlerServer; instead of in the TrackRecordingService. //TODO TrackPoint should be created by TrackPointCreator; instead of in the TrackRecordingService.
@Deprecated @Deprecated
public SensorDataSet fill(TrackPoint trackPoint) { public SensorDataSet fill(TrackPoint trackPoint) {
SensorDataSet sensorDataSet = remoteSensorManager.fill(trackPoint); SensorDataSet sensorDataSet = remoteSensorManager.fill(trackPoint);