HandlerServer: use executor service to send data to TrackRecordingService.

Fixes #329.
This commit is contained in:
Dennis Guse
2020-07-20 18:16:35 +02:00
parent 6540913d59
commit c02b8fab53
4 changed files with 122 additions and 53 deletions
@@ -3,26 +3,46 @@ package de.dennisguse.opentracks.services.handlers;
import android.content.Context;
import android.content.SharedPreferences;
import androidx.annotation.VisibleForTesting;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import de.dennisguse.opentracks.content.data.TrackPoint;
public class HandlerServer {
private String TAG = HandlerServer.class.getSimpleName();
private static String TAG = HandlerServer.class.getSimpleName();
private final LocationHandler locationHandler;
private final HandlerServerInterface service;
private ExecutorService serviceExecutor;
public HandlerServer(HandlerServerInterface service) {
this.locationHandler = new LocationHandler(this);
this.service = service;
}
@VisibleForTesting
HandlerServer(LocationHandler locationHandler, HandlerServerInterface service) {
this.locationHandler = locationHandler;
this.service = service;
}
public void start(Context context) {
serviceExecutor = Executors.newSingleThreadExecutor();
locationHandler.onStart(context);
locationHandler.onSharedPreferenceChanged(context, null, null);
}
public void stop(Context context) {
locationHandler.onStop(context);
if (serviceExecutor != null) {
serviceExecutor.shutdownNow();
}
serviceExecutor = null;
}
public void onSharedPreferenceChanged(Context context, SharedPreferences preferences, String key) {
@@ -30,7 +50,10 @@ public class HandlerServer {
}
public void sendTrackPoint(TrackPoint trackPoint, int recordingGpsAccuracy) {
service.newTrackPoint(trackPoint, recordingGpsAccuracy);
if (serviceExecutor == null || serviceExecutor.isTerminated() || serviceExecutor.isShutdown()) {
return;
}
serviceExecutor.execute(() -> service.newTrackPoint(trackPoint, recordingGpsAccuracy));
}
public interface HandlerServerInterface {
@@ -67,31 +67,13 @@ class LocationHandler implements HandlerServer.Handler, LocationListener {
}
}
@Override
public void onLocationChanged(@NonNull Location location) {
// TODO do we still need to process the location processing in an asynchronous manner? Let's go to check it out.
computeLocation(location);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
}
@Override
public void onProviderEnabled(@NonNull String provider) {
}
@Override
public void onProviderDisabled(@NonNull String provider) {
}
/**
* Checks if location is valid and builds a track point that will be send through HandlerServer.
*
* @param location {@link Location} object.
*/
private void computeLocation(Location location) {
@Override
public void onLocationChanged(@NonNull Location location) {
if (!LocationUtils.isValidLocation(location)) {
Log.w(TAG, "Ignore newTrackPoint. location is invalid.");
return;
@@ -118,6 +100,18 @@ class LocationHandler implements HandlerServer.Handler, LocationListener {
handlerServer.sendTrackPoint(trackPoint, recordingGpsAccuracy);
}
@Override
public void onStatusChanged(String provider, int status, Bundle extras) {
}
@Override
public void onProviderEnabled(@NonNull String provider) {
}
@Override
public void onProviderDisabled(@NonNull String provider) {
}
private void registerLocationListener() {
if (locationManager == null) {
Log.e(TAG, "locationManager is null.");