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

Merge branch 'master' of git://github.com/24hours/AntennaPod into 24hours-master

This commit is contained in:
daniel oeh 2014-12-28 12:58:44 +01:00
parent 4ec7d54e8b 5f503cc5fd
commit 40408e7063
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,7 +291,6 @@ public class PlaybackService extends Service {
private void handleKeycode(int keycode) { private void handleKeycode(int keycode) {
if (BuildConfig.DEBUG) if (BuildConfig.DEBUG)
Log.d(TAG, "Handling keycode: " + keycode); Log.d(TAG, "Handling keycode: " + keycode);
final PlaybackServiceMediaPlayer.PSMPInfo info = mediaPlayer.getPSMPInfo(); final PlaybackServiceMediaPlayer.PSMPInfo info = mediaPlayer.getPSMPInfo();
final PlayerStatus status = info.playerStatus; final PlayerStatus status = info.playerStatus;
switch (keycode) { switch (keycode) {
@ -322,12 +321,14 @@ public class PlaybackService extends Service {
break; break;
case KeyEvent.KEYCODE_MEDIA_PAUSE: case KeyEvent.KEYCODE_MEDIA_PAUSE:
if (status == PlayerStatus.PLAYING) { if (status == PlayerStatus.PLAYING) {
if (UserPreferences.isPersistNotify()) { mediaPlayer.pause(false, true);
mediaPlayer.pause(false, true);
} else {
mediaPlayer.pause(true, true);
}
} }
if (UserPreferences.isPersistNotify()) {
mediaPlayer.pause(false, true);
} else {
mediaPlayer.pause(true, true);
}
break; break;
case KeyEvent.KEYCODE_MEDIA_NEXT: case KeyEvent.KEYCODE_MEDIA_NEXT:
case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD: case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:
@ -340,7 +341,9 @@ public class PlaybackService extends Service {
case KeyEvent.KEYCODE_MEDIA_STOP: case KeyEvent.KEYCODE_MEDIA_STOP:
if (status == PlayerStatus.PLAYING) { if (status == PlayerStatus.PLAYING) {
mediaPlayer.pause(true, true); mediaPlayer.pause(true, true);
started = false;
} }
stopForeground(true); // gets rid of persistent notification stopForeground(true); // gets rid of persistent notification
break; break;
default: default:
@ -418,10 +421,13 @@ public class PlaybackService extends Service {
taskManager.cancelWidgetUpdater(); taskManager.cancelWidgetUpdater();
if (UserPreferences.isPersistNotify() && android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { if (UserPreferences.isPersistNotify() && 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]
setupNotification(newInfo);
} else { } else {
// remove notifcation on pause // remove notifcation on pause
stopForeground(true); stopForeground(true);
} }
break; break;
case STOPPED: case STOPPED:
@ -438,6 +444,7 @@ public class PlaybackService extends Service {
taskManager.startPositionSaver(); taskManager.startPositionSaver();
taskManager.startWidgetUpdater(); taskManager.startWidgetUpdater();
setupNotification(newInfo); setupNotification(newInfo);
started = true;
break; break;
case ERROR: case ERROR:
writePlaybackPreferencesNoMediaPlaying(); writePlaybackPreferencesNoMediaPlaying();
@ -741,8 +748,9 @@ public class PlaybackService extends Service {
PlaybackServiceMediaPlayer.PSMPInfo newInfo = mediaPlayer.getPSMPInfo(); PlaybackServiceMediaPlayer.PSMPInfo newInfo = mediaPlayer.getPSMPInfo();
final int smallIcon = ClientConfig.playbackServiceCallbacks.getNotificationIconResource(getApplicationContext()); final int smallIcon = ClientConfig.playbackServiceCallbacks.getNotificationIconResource(getApplicationContext());
if (!isCancelled() && info.playerStatus == PlayerStatus.PLAYING if (!isCancelled() &&
&& info.playable != null) { started == true &&
info.playable != null) {
String contentText = info.playable.getFeedTitle(); String contentText = info.playable.getFeedTitle();
String contentTitle = info.playable.getEpisodeTitle(); String contentTitle = info.playable.getEpisodeTitle();
Notification notification = null; Notification notification = null;
@ -782,16 +790,21 @@ public class PlaybackService extends Service {
.setContentIntent(pIntent) .setContentIntent(pIntent)
.setLargeIcon(icon) .setLargeIcon(icon)
.setSmallIcon(smallIcon) .setSmallIcon(smallIcon)
.setPriority(UserPreferences.getNotifyPriority()) // set notification priority .setPriority(UserPreferences.getNotifyPriority()); // set notification priority
.addAction(android.R.drawable.ic_media_play, //play action if(newInfo.playerStatus == PlayerStatus.PLAYING){
getString(R.string.play_label), notificationBuilder.addAction(android.R.drawable.ic_media_pause, //pause action
playButtonPendingIntent) getString(R.string.pause_label),
.addAction(android.R.drawable.ic_media_pause, //pause action pauseButtonPendingIntent);
getString(R.string.pause_label), } else {
pauseButtonPendingIntent) notificationBuilder.addAction(android.R.drawable.ic_media_play, //play action
.addAction(android.R.drawable.ic_menu_close_clear_cancel, // stop action getString(R.string.play_label),
getString(R.string.stop_label), playButtonPendingIntent);
stopButtonPendingIntent); }
if(UserPreferences.isPersistNotify()) {
notificationBuilder.addAction(android.R.drawable.ic_menu_close_clear_cancel, // stop action
getString(R.string.stop_label),
stopButtonPendingIntent);
}
notification = notificationBuilder.build(); notification = notificationBuilder.build();
} else { } else {
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder( NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(
@ -802,9 +815,7 @@ public class PlaybackService extends Service {
.setSmallIcon(smallIcon); .setSmallIcon(smallIcon);
notification = notificationBuilder.getNotification(); notification = notificationBuilder.getNotification();
} }
if (newInfo.playerStatus == PlayerStatus.PLAYING) { startForeground(NOTIFICATION_ID, notification);
startForeground(NOTIFICATION_ID, notification);
}
if (BuildConfig.DEBUG) if (BuildConfig.DEBUG)
Log.d(TAG, "Notification set up"); Log.d(TAG, "Notification set up");
} }