forked from upstream-mirrors/OpenTracks
Renamed GPSHandler to GPSManager.
This commit is contained in:
+2
-2
@@ -26,7 +26,7 @@ import de.dennisguse.opentracks.data.models.Distance;
|
|||||||
import de.dennisguse.opentracks.settings.PreferencesUtils;
|
import de.dennisguse.opentracks.settings.PreferencesUtils;
|
||||||
|
|
||||||
@RunWith(MockitoJUnitRunner.class)
|
@RunWith(MockitoJUnitRunner.class)
|
||||||
public class GPSHandlerTest {
|
public class GPSManagerTest {
|
||||||
|
|
||||||
private final Context context = ApplicationProvider.getApplicationContext();
|
private final Context context = ApplicationProvider.getApplicationContext();
|
||||||
|
|
||||||
@@ -34,7 +34,7 @@ public class GPSHandlerTest {
|
|||||||
private TrackPointCreator trackPointCreator;
|
private TrackPointCreator trackPointCreator;
|
||||||
|
|
||||||
@InjectMocks
|
@InjectMocks
|
||||||
private GPSHandler locationHandler;
|
private GPSManager locationHandler;
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public static void preSetUp() {
|
public static void preSetUp() {
|
||||||
+1
-1
@@ -25,7 +25,7 @@ public class TrackPointCreatorTest {
|
|||||||
private TrackPointCreator.Callback server;
|
private TrackPointCreator.Callback server;
|
||||||
|
|
||||||
@Mock
|
@Mock
|
||||||
private GPSHandler locationHandler;
|
private GPSManager locationHandler;
|
||||||
|
|
||||||
private TrackPointCreator subject;
|
private TrackPointCreator subject;
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -26,9 +26,9 @@ import de.dennisguse.opentracks.util.LocationUtils;
|
|||||||
import de.dennisguse.opentracks.util.PermissionRequester;
|
import de.dennisguse.opentracks.util.PermissionRequester;
|
||||||
|
|
||||||
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
|
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
|
||||||
public class GPSHandler implements SensorConnector, LocationListenerCompat, GpsStatus.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
|
public class GPSManager implements SensorConnector, LocationListenerCompat, GpsStatus.GpsStatusListener, SharedPreferences.OnSharedPreferenceChangeListener {
|
||||||
|
|
||||||
private final String TAG = GPSHandler.class.getSimpleName();
|
private final String TAG = GPSManager.class.getSimpleName();
|
||||||
|
|
||||||
public static final String LOCATION_PROVIDER = LocationManager.GPS_PROVIDER;
|
public static final String LOCATION_PROVIDER = LocationManager.GPS_PROVIDER;
|
||||||
|
|
||||||
@@ -41,7 +41,7 @@ public class GPSHandler implements SensorConnector, LocationListenerCompat, GpsS
|
|||||||
private Duration gpsInterval;
|
private Duration gpsInterval;
|
||||||
private Distance thresholdHorizontalAccuracy;
|
private Distance thresholdHorizontalAccuracy;
|
||||||
|
|
||||||
public GPSHandler(TrackPointCreator trackPointCreator) {
|
public GPSManager(TrackPointCreator trackPointCreator) {
|
||||||
this.trackPointCreator = trackPointCreator;
|
this.trackPointCreator = trackPointCreator;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,25 +33,25 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
|
|||||||
@NonNull
|
@NonNull
|
||||||
private Clock clock = new MonotonicClock();
|
private Clock clock = new MonotonicClock();
|
||||||
|
|
||||||
private final GPSHandler gpsHandler;
|
private final GPSManager gpsManager;
|
||||||
private SensorManager sensorManager;
|
private SensorManager sensorManager;
|
||||||
|
|
||||||
public TrackPointCreator(Callback service, Context context, Handler handler) {
|
public TrackPointCreator(Callback service, Context context, Handler handler) {
|
||||||
this.service = service;
|
this.service = service;
|
||||||
this.gpsHandler = new GPSHandler(this);
|
this.gpsManager = new GPSManager(this);
|
||||||
this.sensorManager = new SensorManager(context, handler, this);
|
this.sensorManager = new SensorManager(context, handler, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
TrackPointCreator(GPSHandler gpsHandler, Callback service) {
|
TrackPointCreator(GPSManager gpsManager, Callback service) {
|
||||||
this.service = service;
|
this.service = service;
|
||||||
this.gpsHandler = gpsHandler;
|
this.gpsManager = gpsManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
public synchronized void start(@NonNull Context context, @NonNull Handler handler) {
|
public synchronized void start(@NonNull Context context, @NonNull Handler handler) {
|
||||||
this.context = context;
|
this.context = context;
|
||||||
|
|
||||||
gpsHandler.start(context, handler);
|
gpsManager.start(context, handler);
|
||||||
sensorManager.start(context, handler);
|
sensorManager.start(context, handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,7 +73,7 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
|
|||||||
}
|
}
|
||||||
|
|
||||||
public synchronized void stop() {
|
public synchronized void stop() {
|
||||||
gpsHandler.stop(context);
|
gpsManager.stop(context);
|
||||||
|
|
||||||
this.context = null;
|
this.context = null;
|
||||||
}
|
}
|
||||||
@@ -94,7 +94,7 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
|
|||||||
public void onNewTrackPoint(@NonNull TrackPoint trackPoint) {
|
public void onNewTrackPoint(@NonNull TrackPoint trackPoint) {
|
||||||
addSensorData(trackPoint);
|
addSensorData(trackPoint);
|
||||||
|
|
||||||
boolean stored = service.newTrackPoint(trackPoint, gpsHandler.getThresholdHorizontalAccuracy());
|
boolean stored = service.newTrackPoint(trackPoint, gpsManager.getThresholdHorizontalAccuracy());
|
||||||
if (stored) {
|
if (stored) {
|
||||||
reset();
|
reset();
|
||||||
}
|
}
|
||||||
@@ -153,8 +153,8 @@ public class TrackPointCreator implements SensorManager.SensorDataSetChangeObser
|
|||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
public GPSHandler getGpsHandler() {
|
public GPSManager getGpsHandler() {
|
||||||
return gpsHandler;
|
return gpsManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
void sendGpsStatus(GpsStatusValue gpsStatusValue) {
|
void sendGpsStatus(GpsStatusValue gpsStatusValue) {
|
||||||
|
|||||||
Reference in New Issue
Block a user