Refactor: rename LocationHandler to GPSHandler.

src/androidTest/java/de/dennisguse/opentracks/io/file/importer/ExportImportTest.java

@@ -423,6 +423,6 @@ public class ExportImportTest {
         });
 
         trackPointCreator.setClock(Clock.fixed(time, ZoneId.of("CET")));
-        trackPointCreator.getLocationHandler().onLocationChanged(location);
+        trackPointCreator.getGpsHandler().onLocationChanged(location);
     }
 }

src/androidTest/java/de/dennisguse/opentracks/services/handlers/GPSHandlerTest.java

@@ -26,7 +26,7 @@ import de.dennisguse.opentracks.content.data.TrackPoint;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 
 @RunWith(MockitoJUnitRunner.class)
-public class LocationHandlerTest {
+public class GPSHandlerTest {
 
     private final Context context = ApplicationProvider.getApplicationContext();
 
@@ -34,7 +34,7 @@ public class LocationHandlerTest {
     private TrackPointCreator trackPointCreator;
 
     @InjectMocks
-    private LocationHandler locationHandler;
+    private GPSHandler locationHandler;
 
     @BeforeClass
     public static void preSetUp() {

src/androidTest/java/de/dennisguse/opentracks/services/handlers/TrackPointCreatorTest.java

@@ -26,7 +26,7 @@ public class TrackPointCreatorTest {
     private TrackPointCreator.Callback server;
 
     @Mock
-    private LocationHandler locationHandler;
+    private GPSHandler locationHandler;
 
     @Mock
     private SharedPreferences sharedPreferences;

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -72,6 +72,8 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
     public static final RecordingData NOT_RECORDING = new RecordingData(null, null, null);
     public static final GpsStatusValue STATUS_GPS_DEFAULT = GpsStatusValue.GPS_NONE;
 
+    private final Binder binder = new Binder();
+
     // The following variables are setFrequency in onCreate:
     private VoiceAnnouncementManager voiceAnnouncementManager;
     private TrackRecordingServiceNotificationManager notificationManager;
@@ -114,11 +116,9 @@ public class TrackRecordingService extends Service implements TrackPointCreator.
         }
     };
 
-    // The following variables are setFrequency when recording:
+    // The following variables are set when recording:
     private WakeLock wakeLock;
 
-    private final Binder binder = new Binder();
-
     private TrackPointCreator trackPointCreator; //TODO Move to TrackRecordingManager?
 
     private RecordingStatus recordingStatus;

src/main/java/de/dennisguse/opentracks/services/handlers/GPSHandler.java

@@ -15,13 +15,13 @@ import java.time.Duration;
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.content.data.Distance;
 import de.dennisguse.opentracks.content.data.TrackPoint;
-import de.dennisguse.opentracks.util.LocationUtils;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
+import de.dennisguse.opentracks.util.LocationUtils;
 
 @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-public class LocationHandler implements LocationListener, GpsStatus.GpsStatusListener {
+public class GPSHandler implements LocationListener, GpsStatus.GpsStatusListener {
 
-    private final String TAG = LocationHandler.class.getSimpleName();
+    private final String TAG = GPSHandler.class.getSimpleName();
 
     private LocationManager locationManager;
     private final TrackPointCreator trackPointCreator;
@@ -30,7 +30,7 @@ public class LocationHandler implements LocationListener, GpsStatus.GpsStatusLis
     private Distance thresholdHorizontalAccuracy;
     private TrackPoint lastTrackPoint;
 
-    public LocationHandler(TrackPointCreator trackPointCreator) {
+    public GPSHandler(TrackPointCreator trackPointCreator) {
         this.trackPointCreator = trackPointCreator;
     }
 

src/main/java/de/dennisguse/opentracks/services/handlers/TrackPointCreator.java

@@ -31,25 +31,25 @@ public class TrackPointCreator {
     @NonNull
     private Clock clock = Clock.systemUTC();
 
-    private final LocationHandler locationHandler;
+    private final GPSHandler gpsHandler;
     private BluetoothRemoteSensorManager remoteSensorManager;
     private AltitudeSumManager altitudeSumManager;
 
     public TrackPointCreator(Callback service) {
         this.service = service;
-        this.locationHandler = new LocationHandler(this);
+        this.gpsHandler = new GPSHandler(this);
     }
 
     @VisibleForTesting
-    TrackPointCreator(LocationHandler locationHandler, Callback service) {
+    TrackPointCreator(GPSHandler gpsHandler, Callback service) {
         this.service = service;
-        this.locationHandler = locationHandler;
+        this.gpsHandler = gpsHandler;
     }
 
     public void start(@NonNull Context context) {
         this.context = context;
 
-        locationHandler.onStart(context);
+        gpsHandler.onStart(context);
 
         remoteSensorManager = new BluetoothRemoteSensorManager(context);
         remoteSensorManager.start();
@@ -62,7 +62,7 @@ public class TrackPointCreator {
     //There should be a cooler way to do this; we want to send fake locations without getting affected by real GPS data.
     @VisibleForTesting
     public void stopGPS() {
-        locationHandler.onStop();
+        gpsHandler.onStop();
     }
 
     public void resetSensorData() {
@@ -82,7 +82,7 @@ public class TrackPointCreator {
     }
 
     public void stop() {
-        locationHandler.onStop();
+        gpsHandler.onStop();
 
         if (remoteSensorManager != null) {
             remoteSensorManager.stop();
@@ -98,7 +98,7 @@ public class TrackPointCreator {
     }
 
     public void onSharedPreferenceChanged(String key) {
-        locationHandler.onSharedPreferenceChanged(key);
+        gpsHandler.onSharedPreferenceChanged(key);
     }
 
     public void onNewTrackPoint(TrackPoint trackPoint, Distance thresholdHorizontalAccuracy) {
@@ -123,7 +123,7 @@ public class TrackPointCreator {
 
     public Pair<TrackPoint, SensorDataSet> createCurrentTrackPoint(@Nullable TrackPoint lastValidTrackPoint) {
         TrackPoint currentTrackPoint = new TrackPoint(TrackPoint.Type.TRACKPOINT, createNow());
-        TrackPoint lastTrackPoint = locationHandler.getLastTrackPoint();
+        TrackPoint lastTrackPoint = gpsHandler.getLastTrackPoint();
 
         if (lastTrackPoint != null && lastTrackPoint.hasLocation()) {
             currentTrackPoint.setSpeed(lastTrackPoint.getSpeed());
@@ -166,8 +166,8 @@ public class TrackPointCreator {
     }
 
     @VisibleForTesting
-    public LocationHandler getLocationHandler() {
+    public GPSHandler getGpsHandler() {
-        return locationHandler;
+        return gpsHandler;
     }
 
     void sendGpsStatus(GpsStatusValue gpsStatusValue) {