karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Fixed ControlRecordingService: only unbind if connected.

Browse Source
This commit is contained in:
Dennis Guse
2019-09-04 17:43:24 +02:00
parent 0f311e062e
commit 7b3d5848b9
2 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/services/ControlRecordingService.java
+40 -22
View File
@@ -20,12 +20,14 @@ import android.app.IntentService;
import android.content.ComponentName;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.Binder;
import android.os.IBinder;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import de.dennisguse.opentracks.widgets.TrackWidgetProvider;
import de.dennisguse.opentracks.R;
import de.dennisguse.opentracks.widgets.TrackWidgetProvider;
/**
* A service to control starting and stopping of a recording. This service,
@@ -57,6 +59,39 @@ public class ControlRecordingService extends IntentService implements ServiceCon
bindService(newIntent, this, 0);
}
@VisibleForTesting
@Nullable
@Override
public IBinder onBind(Intent intent) {
return new LocalBinder();
}
/**
* Handles the intent to start or stop a recording.
*
* @param intent to be handled
* @param service the trackRecordingService
*/
@VisibleForTesting
void onHandleIntent(Intent intent, ITrackRecordingService service) {
String action = intent.getAction();
if (action != null) {
if (action.equals(getString(R.string.track_action_start))) {
service.startNewTrack();
} else if (action.equals(getString(R.string.track_action_end))) {
service.endCurrentTrack();
} else if (action.equals(getString(R.string.track_action_pause))) {
service.pauseCurrentTrack();
} else if (action.equals(getString(R.string.track_action_resume))) {
service.resumeCurrentTrack();
}
}
if (connected) {
unbindService(this);
connected = false;
}
}
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
trackRecordingService = (ITrackRecordingService) service;
@@ -97,31 +132,14 @@ public class ControlRecordingService extends IntentService implements ServiceCon
onHandleIntent(intent, trackRecordingService);
}
/**
* Handles the intent to start or stop a recording.
*
* @param intent to be handled
* @param service the trackRecordingService
*/
@VisibleForTesting
void onHandleIntent(Intent intent, ITrackRecordingService service) {
String action = intent.getAction();
if (action != null) {
if (action.equals(getString(R.string.track_action_start))) {
service.startNewTrack();
} else if (action.equals(getString(R.string.track_action_end))) {
service.endCurrentTrack();
} else if (action.equals(getString(R.string.track_action_pause))) {
service.pauseCurrentTrack();
} else if (action.equals(getString(R.string.track_action_resume))) {
service.resumeCurrentTrack();
}
public class LocalBinder extends Binder {
ControlRecordingService getService() {
return ControlRecordingService.this;
}
unbindService(this);
connected = false;
}
@Override
public void onDestroy() {
super.onDestroy();