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

refactor stop PlaybackService setupNotification() - extract common 

code as private helper.
This commit is contained in:
orionlee 2019-01-06 13:35:00 -08:00
parent f0f8623937
commit 221cd4b480
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1336,29 +1336,30 @@ public class PlaybackService extends MediaBrowserServiceCompat {
Log.v(TAG, "DBG - notificationSetupTask: make service foreground"); Log.v(TAG, "DBG - notificationSetupTask: make service foreground");
startForeground(NOTIFICATION_ID, notification); startForeground(NOTIFICATION_ID, notification);
} else if (playerStatus == PlayerStatus.PAUSED) { } else if (playerStatus == PlayerStatus.PAUSED) {
// TODO: logic originally in mediaPlayerCallback case PAUSED.
if (treatPauseAsStop) { if (treatPauseAsStop) {
stopForeground(true); stopForeground(true);
} else if ((UserPreferences.isPersistNotify() || isCasting) && } else if ((UserPreferences.isPersistNotify() || isCasting) &&
android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
// do not remove notification on pause based on user pref and whether android version supports expanded notifications // do not remove notification on pause based on user pref and whether android version supports expanded notifications
// Change [Play] button to [Pause] // Change [Play] button to [Pause]
// TODO LATER: logic same as outer else clause: setupNotification(info) leaveNotificationAsBackground(notification);
stopForeground(false);
NotificationManager mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
mNotificationManager.notify(NOTIFICATION_ID, notification);
} else if (!UserPreferences.isPersistNotify() && !isCasting) { } else if (!UserPreferences.isPersistNotify() && !isCasting) {
// remove notification on pause // remove notification on pause
stopForeground(true); stopForeground(true);
} }
} else { } else {
stopForeground(false); leaveNotificationAsBackground(notification);
NotificationManager mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
mNotificationManager.notify(NOTIFICATION_ID, notification);
} }
Log.d(TAG, "Notification set up"); Log.d(TAG, "Notification set up");
} }
} }
private void leaveNotificationAsBackground(@NonNull Notification notification) {
stopForeground(false);
NotificationManager mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
mNotificationManager.notify(NOTIFICATION_ID, notification);
}
}; };
notificationSetupThread = new Thread(notificationSetupTask); notificationSetupThread = new Thread(notificationSetupTask);
notificationSetupThread.start(); notificationSetupThread.start();