Fix for Chromecast issues. Cast API appears to have changed so starting a new song triggers an additional COMPLETED broadcast while it is getting the new song ready

1 files changed, 6 insertions, 1 deletions

diff --git a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
index 566ed773..f9e2bfb1 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/ChromeCastController.java
@@ -23,6 +23,7 @@ import android.util.Log;
 import com.google.android.gms.cast.ApplicationMetadata;
 import com.google.android.gms.cast.Cast;
 import com.google.android.gms.cast.CastDevice;
+import com.google.android.gms.cast.CastStatusCodes;
 import com.google.android.gms.cast.MediaInfo;
 import com.google.android.gms.cast.MediaMetadata;
 import com.google.android.gms.cast.MediaStatus;
@@ -343,6 +344,8 @@ public class ChromeCastController extends RemoteController {
 				public void onResult(RemoteMediaPlayer.MediaChannelResult result) {
 					if (result.getStatus().isSuccess()) {
 						// Handled in other handler
+					} else if(result.getStatus().getStatusCode() == CastStatusCodes.REPLACED) {
+						Log.w(TAG, "Request was replaced: " + currentPlaying.toString());
 					} else {
 						Log.e(TAG, "Failed to load: " + result.getStatus().toString());
 						failedLoad();
@@ -459,7 +462,9 @@ public class ChromeCastController extends RemoteController {
 								break;
 							case MediaStatus.PLAYER_STATE_IDLE:
 								if (mediaStatus.getIdleReason() == MediaStatus.IDLE_REASON_FINISHED) {
-									downloadService.onSongCompleted();
+									if(downloadService.getPlayerState() != PlayerState.PREPARING) {
+										downloadService.onSongCompleted();
+									}
 								} else if (mediaStatus.getIdleReason() == MediaStatus.IDLE_REASON_INTERRUPTED) {
 									if (downloadService.getPlayerState() != PlayerState.PREPARING) {
 										downloadService.setPlayerState(PlayerState.PREPARING);