From 9cb3d8c1bb115931ec131bb384c44ddaf1d1f48e Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Sun, 29 Aug 2021 12:23:14 +0200 Subject: [PATCH] Finished renaming: TrackPointCreator was still referenced as HandlerServer. --- .../io/file/importer/ExportImportTest.java | 40 ++++++------ .../services/TrackRecordingServiceTest.java | 64 +++++++++---------- .../TrackRecordingServiceTestLocation.java | 18 +++--- .../TrackRecordingServiceTestLooper.java | 6 +- .../handlers/LocationHandlerTest.java | 12 ++-- .../services/TrackRecordingManager.java | 14 ++-- .../services/TrackRecordingService.java | 36 +++++------ .../services/handlers/LocationHandler.java | 14 ++-- .../services/handlers/TrackPointCreator.java | 2 +- 9 files changed, 103 insertions(+), 103 deletions(-) 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 4f5291905..f6eaa13ed 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 @@ -112,41 +112,41 @@ public class ExportImportTest { TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class))) .getService(); - service.getHandlerServer().setClock(Clock.systemUTC()); + service.getTrackPointCreator().setClock(Clock.systemUTC()); } public void setUp(boolean hasSensorDistance) throws TimeoutException { TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(new Intent(context, TrackRecordingService.class))) .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(); 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); - sendLocation(handlerServer, 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:04Z"), 3, 14.001, 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); - handlerServer.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:06Z"), ZoneId.of("CET"))); - handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context)); + trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:06Z"), ZoneId.of("CET"))); + trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context)); 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(); - handlerServer.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); + trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:21Z"), ZoneId.of("CET"))); + 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(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:22Z"), 3, 16, 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"))); - handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context)); + trackPointCreator.setClock(Clock.fixed(Instant.parse("2020-02-02T02:02:24Z"), ZoneId.of("CET"))); + trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context)); service.endCurrentTrack(); 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.setLatitude(latitude); location.setLongitude(longitude); @@ -388,7 +388,7 @@ public class ExportImportTest { location.setSpeed(speed); location.setAltitude(altitude); - handlerServer.setAltitudeSumManager(new AltitudeSumManager() { + trackPointCreator.setAltitudeSumManager(new AltitudeSumManager() { @Override public void fill(@NonNull TrackPoint trackPoint) { trackPoint.setAltitudeGain(altitudeGain); @@ -396,7 +396,7 @@ public class ExportImportTest { } }); - handlerServer.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) { + trackPointCreator.setRemoteSensorManager(new BluetoothRemoteSensorManager(context) { @Override public SensorDataSet fill(@NonNull TrackPoint trackPoint) { SensorDataSet sensorDataSet = new SensorDataSet(); @@ -422,7 +422,7 @@ public class ExportImportTest { } }); - handlerServer.setClock(Clock.fixed(time, ZoneId.of("CET"))); - handlerServer.getLocationHandler().onLocationChanged(location); + trackPointCreator.setClock(Clock.fixed(time, ZoneId.of("CET"))); + trackPointCreator.getLocationHandler().onLocationChanged(location); } } \ No newline at end of file diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java index 793846b14..74b11141e 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTest.java @@ -138,7 +138,7 @@ public class TrackRecordingServiceTest { if (service.isRecording() || service.isPaused()) { service.endCurrentTrack(); } - service.getHandlerServer().setClock(Clock.systemUTC()); + service.getTrackPointCreator().setClock(Clock.systemUTC()); // Ensure that the database is empty after every test contentProviderUtils.deleteAllTracks(context); @@ -212,15 +212,15 @@ public class TrackRecordingServiceTest { TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) .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(); - handlerServer.stopGPS(); - handlerServer.setAltitudeSumManager(altitudeSumManager); + trackPointCreator.stopGPS(); + trackPointCreator.setAltitudeSumManager(altitudeSumManager); // 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(); // then @@ -242,22 +242,22 @@ public class TrackRecordingServiceTest { TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) .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(); - handlerServer.stopGPS(); - handlerServer.setAltitudeSumManager(altitudeSumManager); + trackPointCreator.stopGPS(); + trackPointCreator.setAltitudeSumManager(altitudeSumManager); // 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(); // then assertEquals(2, contentProviderUtils.getTrackPointCursor(trackId, null).getCount()); //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); // then @@ -281,23 +281,23 @@ public class TrackRecordingServiceTest { TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) .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(); - handlerServer.stopGPS(); - handlerServer.setAltitudeSumManager(altitudeSumManager); + trackPointCreator.stopGPS(); + 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(); // 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); - handlerServer.stopGPS(); - handlerServer.setAltitudeSumManager(altitudeSumManager); + trackPointCreator.stopGPS(); + 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 assertTrue(service.isRecording()); @@ -323,18 +323,18 @@ public class TrackRecordingServiceTest { TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) .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(); - handlerServer.stopGPS(); - handlerServer.setAltitudeSumManager(altitudeSumManager); + trackPointCreator.stopGPS(); + 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(); // 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(); // then @@ -405,14 +405,14 @@ public class TrackRecordingServiceTest { TrackRecordingService service = ((TrackRecordingService.Binder) mServiceRule.bindService(createStartIntent(context))) .getService(); - TrackPointCreator handlerServer = service.getHandlerServer(); - handlerServer.stopGPS(); + TrackPointCreator trackPointCreator = service.getTrackPointCreator(); + 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(); assertTrue(service.isRecording()); - handlerServer.onNewTrackPoint( + trackPointCreator.onNewTrackPoint( new TrackPoint(TrackPoint.Type.TRACKPOINT, Instant.parse("2020-02-02T02:02:03Z")) .setLatitude(10) .setLongitude(10) @@ -467,6 +467,6 @@ public class TrackRecordingServiceTest { .setSpeed(Speed.of(speed)) .setBearing(3.0f); - trackRecordingService.getHandlerServer().onNewTrackPoint(trackPoint, Distance.of(50)); + trackRecordingService.getTrackPointCreator().onNewTrackPoint(trackPoint, Distance.of(50)); } } diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java index 4d195ae4f..85c1c8d20 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLocation.java @@ -96,7 +96,7 @@ public class TrackRecordingServiceTestLocation { service = ((TrackRecordingService.Binder) mServiceRule.bindService(TrackRecordingServiceTest.createStartIntent(context))) .getService(); - service.getHandlerServer().stopGPS(); + service.getTrackPointCreator().stopGPS(); } @After @@ -110,7 +110,7 @@ public class TrackRecordingServiceTestLocation { public void testOnLocationChangedAsync_movingAccurate() { // given Track.Id trackId = service.startNewTrack(); - service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); + service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager); // when TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15); @@ -183,7 +183,7 @@ public class TrackRecordingServiceTestLocation { public void testOnLocationChangedAsync_slowMovingAccurate() { // given Track.Id trackId = service.startNewTrack(); - service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); + service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager); // when TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15); @@ -228,7 +228,7 @@ public class TrackRecordingServiceTestLocation { public void testOnLocationChangedAsync_idle() { // given Track.Id trackId = service.startNewTrack(); - service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); + service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager); // when TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0); @@ -280,8 +280,8 @@ public class TrackRecordingServiceTestLocation { public void testOnLocationChangedAsync_idle_withMovement() { // given Track.Id trackId = service.startNewTrack(); - service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); - service.getHandlerServer().stopGPS(); + service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager); + service.getTrackPointCreator().stopGPS(); // when TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 15); @@ -340,8 +340,8 @@ public class TrackRecordingServiceTestLocation { public void testOnLocationChangedAsync_idle_withSensorData() { // given Track.Id trackId = service.startNewTrack(); - service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); - service.getHandlerServer().setRemoteSensorManager(new BluetoothRemoteSensorManager(context) { + service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager); + service.getTrackPointCreator().setRemoteSensorManager(new BluetoothRemoteSensorManager(context) { @Override public boolean isEnabled() { @@ -435,7 +435,7 @@ public class TrackRecordingServiceTestLocation { public void testOnLocationChangedAsync_segment() { // given Track.Id trackId = service.startNewTrack(); - service.getHandlerServer().setAltitudeSumManager(altitudeSumManager); + service.getTrackPointCreator().setAltitudeSumManager(altitudeSumManager); // when TrackRecordingServiceTest.newTrackPoint(service, 45.0, 35.0, 1, 0); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java index bbd47c89a..2ea29eeb6 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/TrackRecordingServiceTestLooper.java @@ -235,8 +235,8 @@ public class TrackRecordingServiceTestLooper { // Insert a few points, markers and statistics. for (int i = 0; i < 30; i++) { - //TODO Should send locations to LocationHandler instead of TrackPoints to HandlerServer? - TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, service.getHandlerServer().createNow()) + //TODO Should send locations to LocationHandler instead of TrackPoints to TrackPointCreator? + TrackPoint trackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, service.getTrackPointCreator().createNow()) .setLongitude(35.0f + i / 10.0f) .setLatitude(45.0f - i / 5.0f) .setHorizontalAccuracy(Distance.of(5)) @@ -244,7 +244,7 @@ public class TrackRecordingServiceTestLooper { .setBearing(3.0f); Distance prefAccuracy = PreferencesUtils.getThresholdHorizontalAccuracy(sharedPreferences, context); - service.getHandlerServer().onNewTrackPoint(trackPoint, prefAccuracy); + service.getTrackPointCreator().onNewTrackPoint(trackPoint, prefAccuracy); if (i % 7 == 0) { service.insertMarker(null, null, null, null); diff --git a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java index 90f96a272..cca192d60 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java +++ b/src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java @@ -33,7 +33,7 @@ public class LocationHandlerTest { private final SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context); @Mock - private TrackPointCreator handlerServer; + private TrackPointCreator trackPointCreator; @InjectMocks private LocationHandler locationHandler; @@ -49,7 +49,7 @@ public class LocationHandlerTest { // Let's use default values. sharedPreferences.edit().clear().commit(); - Mockito.when(handlerServer.createNow()) + Mockito.when(trackPointCreator.createNow()) .thenReturn(Instant.now()); //TODO REMOVE @@ -67,7 +67,7 @@ public class LocationHandlerTest { locationHandler.onLocationChanged(createLocation(45f, 35f, 3, 5, System.currentTimeMillis())); // 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())); // 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 // 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 @@ -112,7 +112,7 @@ public class LocationHandlerTest { locationHandler.onLocationChanged(createLocation(99.0, 35.0, Long.MAX_VALUE, 15, System.currentTimeMillis())); // then - verify(handlerServer, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class)); + verify(trackPointCreator, times(1)).onNewTrackPoint(any(TrackPoint.class), any(Distance.class)); } /** diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java index eecee9e9a..19cc6a029 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingManager.java @@ -81,19 +81,19 @@ class TrackRecordingManager { insertTrackPoint(trackId, segmentStartTrackPoint); } - void pause(TrackPointCreator handlerServer) { + void pause(TrackPointCreator trackPointCreator) { if (lastTrackPoint != null) { insertTrackPointIfNewer(trackId, lastTrackPoint); } - insertTrackPoint(trackId, handlerServer.createSegmentEnd()); + insertTrackPoint(trackId, trackPointCreator.createSegmentEnd()); } - void end(TrackPointCreator handlerServer) { + void end(TrackPointCreator trackPointCreator) { if (lastTrackPoint != null) { insertTrackPointIfNewer(trackId, lastTrackPoint); } - TrackPoint segmentEnd = handlerServer.createSegmentEnd(); + TrackPoint segmentEnd = trackPointCreator.createSegmentEnd(); insertTrackPoint(trackId, segmentEnd); trackId = null; @@ -103,12 +103,12 @@ class TrackRecordingManager { isIdle = false; } - Pair> get(TrackPointCreator handlerServer) { - if (handlerServer == null) { + Pair> get(TrackPointCreator trackPointCreator) { + if (trackPointCreator == null) { return null; } TrackStatisticsUpdater tmpTrackStatisticsUpdater = getTrackStatisticsUpdater(); - Pair current = handlerServer.createCurrentTrackPoint(lastTrackPoint); + Pair current = trackPointCreator.createCurrentTrackPoint(lastTrackPoint); tmpTrackStatisticsUpdater.addTrackPoint(current.first, recordingDistanceInterval); diff --git a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java index 8d93da21b..d3e84f47f 100644 --- a/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java +++ b/src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java @@ -112,7 +112,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator. } - handlerServer.onSharedPreferenceChanged(sharedPreferences, key); + trackPointCreator.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 TrackPointCreator handlerServer; //TODO Move to TrackRecordingManager? + private TrackPointCreator trackPointCreator; //TODO Move to TrackRecordingManager? private RecordingStatus recordingStatus; private MutableLiveData recordingStatusObservable; @@ -141,7 +141,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator. recordingDataObservable = new MutableLiveData<>(NOT_RECORDING); trackRecordingManager = new TrackRecordingManager(this); - handlerServer = new TrackPointCreator(this); + trackPointCreator = new TrackPointCreator(this); voiceAnnouncementManager = new VoiceAnnouncementManager(this); @@ -166,8 +166,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator. public void onDestroy() { handler = null; - handlerServer.stop(); - handlerServer = null; + trackPointCreator.stop(); + trackPointCreator = null; // Reverse order from onCreate showNotification(false); //TODO Why? @@ -219,7 +219,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator. } // Set recording status - Track.Id trackId = trackRecordingManager.start(handlerServer.createSegmentStartManual()); + Track.Id trackId = trackRecordingManager.start(trackPointCreator.createSegmentStartManual()); updateRecordingStatus(RecordingStatus.record(trackId)); startRecording(); @@ -233,8 +233,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator. * @param trackId the id of the track to be resumed. */ public void resumeTrack(Track.Id trackId) { - handlerServer.resetSensorData(); - trackRecordingManager.resume(trackId, handlerServer.createSegmentStartManual()); + trackPointCreator.resetSensorData(); + trackRecordingManager.resume(trackId, trackPointCreator.createSegmentStartManual()); // Set recording status updateRecordingStatus(RecordingStatus.record(trackId)); @@ -272,7 +272,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator. private void startGps() { wakeLock = SystemUtils.acquireWakeLock(this, wakeLock); - handlerServer.start(this); + trackPointCreator.start(this); showNotification(true); } @@ -291,7 +291,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator. updateRecordingStatus(STATUS_DEFAULT); if (!wasPause) { - trackRecordingManager.end(handlerServer); + trackRecordingManager.end(trackPointCreator); } ExportUtils.postWorkoutExport(this, trackId, new ExportServiceResultReceiver(new Handler(), this)); @@ -309,7 +309,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator. // Set recording status updateRecordingStatus(recordingStatus.pause()); - trackRecordingManager.pause(handlerServer); + trackRecordingManager.pause(trackPointCreator); endRecording(false); @@ -333,7 +333,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator. voiceAnnouncementManager.shutdown(); // Update instance variables - handlerServer.stop(); + trackPointCreator.stop(); stopGps(trackStopped); } @@ -350,7 +350,7 @@ public class TrackRecordingService extends Service implements TrackPointCreator. void stopGps(boolean shutdown) { if (!isRecording()) return; - handlerServer.stop(); + trackPointCreator.stop(); showNotification(false); wakeLock = SystemUtils.releaseWakeLock(wakeLock); if (shutdown) { @@ -410,8 +410,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator. @Deprecated @VisibleForTesting - public TrackPointCreator getHandlerServer() { - return handlerServer; + public TrackPointCreator getTrackPointCreator() { + return trackPointCreator; } public LiveData getGpsStatusObservable() { @@ -430,15 +430,15 @@ public class TrackRecordingService extends Service implements TrackPointCreator. // Compute temporary track statistics using sensorData and update time. - TrackPointCreator localHandlerServer = this.handlerServer; + TrackPointCreator localTrackPointCreator = this.trackPointCreator; 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. //TODO This implementation is not a good idea; rather solve the issue for this properly return; } - Pair> data = trackRecordingManager.get(handlerServer); + Pair> data = trackRecordingManager.get(trackPointCreator); if (data == null) { Log.w(TAG, "Requesting data if not recording is taking place, should not be done."); return; diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java index 9d2780ac3..1d4f445a0 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/LocationHandler.java @@ -25,14 +25,14 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis private final String TAG = LocationHandler.class.getSimpleName(); private LocationManager locationManager; - private final TrackPointCreator handlerServer; + private final TrackPointCreator trackPointCreator; private GpsStatus gpsStatus; private Duration gpsInterval; private Distance thresholdHorizontalAccuracy; private TrackPoint lastTrackPoint; - public LocationHandler(TrackPointCreator handlerServer) { - this.handlerServer = handlerServer; + public LocationHandler(TrackPointCreator trackPointCreator) { + this.trackPointCreator = trackPointCreator; } 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. */ @@ -103,7 +103,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis return; } - TrackPoint trackPoint = new TrackPoint(location, handlerServer.createNow()); + TrackPoint trackPoint = new TrackPoint(location, trackPointCreator.createNow()); boolean isAccurate = trackPoint.fulfillsAccuracy(thresholdHorizontalAccuracy); boolean isValid = LocationUtils.isValidLocation(location); @@ -122,7 +122,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis } lastTrackPoint = trackPoint; - handlerServer.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy); + trackPointCreator.onNewTrackPoint(trackPoint, thresholdHorizontalAccuracy); } @Override @@ -167,6 +167,6 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis */ @Override public void onGpsStatusChanged(GpsStatusValue prevStatus, GpsStatusValue currentStatus) { - handlerServer.sendGpsStatus(currentStatus); + trackPointCreator.sendGpsStatus(currentStatus); } } diff --git a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java index 75ad6aeeb..fe0df5582 100644 --- a/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java +++ b/src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java @@ -77,7 +77,7 @@ public class TrackPointCreator { 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 public SensorDataSet fill(TrackPoint trackPoint) { SensorDataSet sensorDataSet = remoteSensorManager.fill(trackPoint);