Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor stop PlaybackService codes - remove legacy dead codes

This commit is contained in:
orionlee 2019-01-06 13:07:49 -08:00
parent 584865ad18
commit f0f8623937
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
View File

@ -466,30 +466,25 @@ public class PlaybackService extends MediaBrowserServiceCompat {
return Service.START_NOT_STICKY; return Service.START_NOT_STICKY;
} }
if ((flags & Service.START_FLAG_REDELIVERY) != 0) { if (keycode != -1) {
Log.d(TAG, "onStartCommand is a redelivered intent, calling stopForeground now."); Log.d(TAG, "Received media button event");
stopForeground(true); // TODO: [2716]-RemoveOptional legacy code from v0.9.8.1 that is no longer applicable, which used to return Service.START_REDELIVER_INTENT. See boolean handled = handleKeycode(keycode, true);
} else { if (!handled) {
if (keycode != -1) { serviceManager.stopService(); // TODO: [2716]-RemoveOptional why is it added in the first place in v1.7.0?
Log.d(TAG, "Received media button event"); return Service.START_NOT_STICKY;
boolean handled = handleKeycode(keycode, true);
if (!handled) {
serviceManager.stopService(); // TODO: [2716]-RemoveOptional why is it added in the first place in v1.7.0?
return Service.START_NOT_STICKY;
}
} else if (!flavorHelper.castDisconnect(castDisconnect) && playable != null) {
boolean stream = intent.getBooleanExtra(EXTRA_SHOULD_STREAM,
true);
boolean startWhenPrepared = intent.getBooleanExtra(EXTRA_START_WHEN_PREPARED, false);
boolean prepareImmediately = intent.getBooleanExtra(EXTRA_PREPARE_IMMEDIATELY, false);
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0);
//If the user asks to play External Media, the casting session, if on, should end.
flavorHelper.castDisconnect(playable instanceof ExternalMedia);
if (playable instanceof FeedMedia) {
playable = DBReader.getFeedMedia(((FeedMedia) playable).getId());
}
mediaPlayer.playMediaObject(playable, stream, startWhenPrepared, prepareImmediately);
} }
} else if (!flavorHelper.castDisconnect(castDisconnect) && playable != null) {
boolean stream = intent.getBooleanExtra(EXTRA_SHOULD_STREAM,
true);
boolean startWhenPrepared = intent.getBooleanExtra(EXTRA_START_WHEN_PREPARED, false);
boolean prepareImmediately = intent.getBooleanExtra(EXTRA_PREPARE_IMMEDIATELY, false);
sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, 0);
//If the user asks to play External Media, the casting session, if on, should end.
flavorHelper.castDisconnect(playable instanceof ExternalMedia);
if (playable instanceof FeedMedia) {
playable = DBReader.getFeedMedia(((FeedMedia) playable).getId());
}
mediaPlayer.playMediaObject(playable, stream, startWhenPrepared, prepareImmediately);
} }
return Service.START_NOT_STICKY; return Service.START_NOT_STICKY;