forked from upstream-mirrors/OpenTracks
Cleanup: TrackDataHub does not need started.
This commit is contained in:
@@ -78,7 +78,6 @@ public class TrackDataHub {
|
|||||||
|
|
||||||
private EGM2008Utils.EGM2008Correction egm2008Correction;
|
private EGM2008Utils.EGM2008Correction egm2008Correction;
|
||||||
|
|
||||||
private boolean started;
|
|
||||||
//TODO Check if this is needed.
|
//TODO Check if this is needed.
|
||||||
private HandlerThread handlerThread;
|
private HandlerThread handlerThread;
|
||||||
private Handler handler;
|
private Handler handler;
|
||||||
@@ -114,11 +113,10 @@ public class TrackDataHub {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void start() {
|
public void start() {
|
||||||
if (started) {
|
if (isStarted()) {
|
||||||
Log.i(TAG, "TrackDataHub already started, ignoring start.");
|
Log.i(TAG, "TrackDataHub already started, ignoring start.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
started = true;
|
|
||||||
handlerThread = new HandlerThread(TAG);
|
handlerThread = new HandlerThread(TAG);
|
||||||
handlerThread.start();
|
handlerThread.start();
|
||||||
handler = new Handler(handlerThread.getLooper());
|
handler = new Handler(handlerThread.getLooper());
|
||||||
@@ -151,13 +149,11 @@ public class TrackDataHub {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
if (!started) {
|
if (!isStarted()) {
|
||||||
Log.i(TAG, "TrackDataHub not started, ignoring stop.");
|
Log.i(TAG, "TrackDataHub not started, ignoring stop.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
started = false;
|
|
||||||
|
|
||||||
//Unregister listeners
|
//Unregister listeners
|
||||||
ContentResolver contentResolver = context.getContentResolver();
|
ContentResolver contentResolver = context.getContentResolver();
|
||||||
contentResolver.unregisterContentObserver(tracksTableObserver);
|
contentResolver.unregisterContentObserver(tracksTableObserver);
|
||||||
@@ -191,7 +187,7 @@ public class TrackDataHub {
|
|||||||
public void registerTrackDataListener(final TrackDataListener trackDataListener) {
|
public void registerTrackDataListener(final TrackDataListener trackDataListener) {
|
||||||
handler.post(() -> {
|
handler.post(() -> {
|
||||||
listeners.add(trackDataListener);
|
listeners.add(trackDataListener);
|
||||||
if (started) {
|
if (isStarted()) {
|
||||||
loadDataForListener(trackDataListener);
|
loadDataForListener(trackDataListener);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -431,6 +427,10 @@ public class TrackDataHub {
|
|||||||
trackStatisticsUpdater = new TrackStatisticsUpdater();
|
trackStatisticsUpdater = new TrackStatisticsUpdater();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean isStarted() {
|
||||||
|
return handlerThread != null;
|
||||||
|
}
|
||||||
|
|
||||||
public void setRecordingStatus(TrackRecordingService.RecordingStatus recordingStatus) {
|
public void setRecordingStatus(TrackRecordingService.RecordingStatus recordingStatus) {
|
||||||
this.recordingStatus = recordingStatus;
|
this.recordingStatus = recordingStatus;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user