Make sure to always show correct fast foward or next buttons

1 files changed, 12 insertions, 5 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
index 08cbf150..803e6f72 100644
--- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
+++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicFragmentActivity.java
@@ -920,7 +920,7 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
 	}
 
 	@Override
-	public void onSongChanged(DownloadFile currentPlaying, int currentPlayingIndex) {
+	public void onSongChanged(DownloadFile currentPlaying, int currentPlayingIndex, boolean shouldFastForward) {
 		this.currentPlaying = currentPlaying;
 
 		MusicDirectory.Entry song = null;
@@ -950,13 +950,18 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
 			getImageLoader().loadImage(coverArtView, song, false, height, false);
 		}
 
-		if(getDownloadService().isCurrentPlayingSingle()) {
+		updateMediaButtons(shouldFastForward);
+	}
+
+	private void updateMediaButtons(boolean shouldFastForward) {
+		DownloadService downloadService = getDownloadService();
+		if(downloadService.isCurrentPlayingSingle()) {
 			previousButton.setVisibility(View.GONE);
 			nextButton.setVisibility(View.GONE);
 			rewindButton.setVisibility(View.GONE);
 			fastforwardButton.setVisibility(View.GONE);
 		} else {
-			if (currentPlaying != null && currentPlaying.getSong() != null && (currentPlaying.getSong().isPodcast() || currentPlaying.getSong().isAudioBook())) {
+			if (shouldFastForward) {
 				previousButton.setVisibility(View.GONE);
 				nextButton.setVisibility(View.GONE);
 
@@ -973,9 +978,11 @@ public class SubsonicFragmentActivity extends SubsonicActivity implements Downlo
 	}
 
 	@Override
-	public void onSongsChanged(List<DownloadFile> songs, DownloadFile currentPlaying, int currentPlayingIndex) {
+	public void onSongsChanged(List<DownloadFile> songs, DownloadFile currentPlaying, int currentPlayingIndex, boolean shouldFastForward) {
 		if(this.currentPlaying != currentPlaying || this.currentPlaying == null) {
-			onSongChanged(currentPlaying, currentPlayingIndex);
+			onSongChanged(currentPlaying, currentPlayingIndex, shouldFastForward);
+		} else {
+			updateMediaButtons(shouldFastForward);
 		}
 	}