upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-02 09:33:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

HandlerServer: disable serviceExecutor to simplify testing for now.

Browse Source 
Part of #882.
This commit is contained in:
Dennis Guse
2021-07-11 19:39:59 +02:00
parent 1255ec8111
commit c9478ea38d
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/androidTest/java/de/dennisguse/opentracks/services/handlers/LocationHandlerTest.java
+4 -4
View File
@@ -15,7 +15,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.content.data.TrackPoint;
import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -46,9 +45,10 @@ public class LocationHandlerTest {
// Let's use default values.
sharedPreferences.edit().clear().commit();
locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.recording_gps_accuracy_key));
locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.min_recording_interval_key));
locationHandler.onStart(context);
//TODO REMOVE
// locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.recording_gps_accuracy_key));
// locationHandler.onSharedPreferenceChanged(context, sharedPreferences, context.getString(R.string.min_recording_interval_key));
locationHandler.onStart(context, sharedPreferences);
}
/**
src/main/java/de/dennisguse/opentracks/services/handlers/HandlerServer.java
+12 -14
View File
@@ -6,9 +6,6 @@ import android.content.SharedPreferences;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import de.dennisguse.opentracks.content.data.TrackPoint;
import de.dennisguse.opentracks.util.PreferencesUtils;
@@ -19,8 +16,8 @@ public class HandlerServer {
private Context context;
private final HandlerServerInterface service;
private ExecutorService serviceExecutor;
// Disabled to simplify testing and implementation of #822
// private ExecutorService serviceExecutor;
private final LocationHandler locationHandler;
private final EGM2008CorrectionManager egm2008CorrectionManager = new EGM2008CorrectionManager();
@@ -38,7 +35,7 @@ public class HandlerServer {
public void start(@NonNull Context context) {
this.context = context;
serviceExecutor = Executors.newSingleThreadExecutor();
// serviceExecutor = Executors.newSingleThreadExecutor();
SharedPreferences sharedPreferences = PreferencesUtils.getSharedPreferences(context);
locationHandler.onStart(context);
@@ -48,10 +45,10 @@ public class HandlerServer {
public void stop() {
locationHandler.onStop(context);
if (serviceExecutor != null) {
serviceExecutor.shutdownNow();
}
serviceExecutor = null;
// if (serviceExecutor != null) {
// serviceExecutor.shutdownNow();
// }
// serviceExecutor = null;
this.context = null;
}
@@ -61,13 +58,14 @@ public class HandlerServer {
}
public void onNewTrackPoint(TrackPoint trackPoint, int recordingGpsAccuracy) {
if (serviceExecutor == null || serviceExecutor.isTerminated() || serviceExecutor.isShutdown()) {
return;
}
// if (serviceExecutor == null || serviceExecutor.isTerminated() || serviceExecutor.isShutdown()) {
// return;
// }
egm2008CorrectionManager.correctAltitude(context, trackPoint);
serviceExecutor.execute(() -> service.newTrackPoint(trackPoint, recordingGpsAccuracy));
// serviceExecutor.execute(() -> service.newTrackPoint(trackPoint, recordingGpsAccuracy));
service.newTrackPoint(trackPoint, recordingGpsAccuracy);
}
void sendGpsStatus(GpsStatusValue gpsStatusValue) {