Don't resubscribe to chromecast unless we're not already subscribed. Only update the play/pause/spinner buttons if the state has changed.

Author: Chris Bellew

mobile/src/main/java/com/atomjack/vcfp/CastPlayerManager.java

@@ -4,6 +4,7 @@
 import android.support.v7.media.MediaRouter;
 
 import com.atomjack.shared.Logger;
+import com.atomjack.shared.NewLogger;
 import com.atomjack.shared.PlayerState;
 import com.atomjack.shared.Preferences;
 import com.atomjack.vcfp.interfaces.ActiveConnectionHandler;
@@ -30,6 +31,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 public class CastPlayerManager {
+  private NewLogger logger;
   private PlexMedia nowPlayingMedia;
   private ArrayList<? extends PlexMedia> nowPlayingPlaylist;
 
@@ -128,6 +130,7 @@ public CastPlayerManager(Context context) {
     mContext = context;
     plexSessionId = VoiceControlForPlexApplication.generateRandomString();
     setCastConsumer();
+    logger = new NewLogger(this);
   }
 
   public void setContext(Context context) {
@@ -384,7 +387,7 @@ public void onDataMessageReceived(String message) {
             if(obj.has("currentState"))
               currentState = PlayerState.getState(obj.getString("currentState"));
             if(listener != null)
-              listener.onTimeUpdate(currentState, obj.getInt("currentTime"));
+              listener.onTimeUpdate(currentState, position);
           } else if(obj.has("event") && obj.getString("event").equals(RECEIVER_EVENTS.PLAYLIST_ADVANCE) && obj.has("media") && obj.has("type")) {
             Logger.d("[CastPlayerManager] playlistAdvance");
             if(obj.getString("type").equals(PARAMS.MEDIA_TYPE_VIDEO))
@@ -394,7 +397,6 @@ public void onDataMessageReceived(String message) {
             if(listener != null)
               listener.onMediaChanged(nowPlayingMedia, PlayerState.PLAYING);
           } else if(obj.has("event") && obj.getString("event").equals(RECEIVER_EVENTS.GET_PLAYBACK_STATE) && obj.has("state")) {
-            Logger.d("Got playback state back: %s", obj.getString("state"));
             PlayerState oldState = currentState;
             currentState = PlayerState.getState(obj.getString("state"));
             if(obj.has("media") && obj.has("type") && obj.has("client")) {

mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

@@ -317,7 +317,8 @@ protected void onCreate(Bundle savedInstanceState) {
           subscribed = true;
           VoiceControlForPlexApplication.getInstance().localClientSubscription.subscribed = true;
         } else if (client.isCastClient) {
-          castPlayerManager.subscribe(client, !castPlayerManager.isSubscribed());
+          if(!castPlayerManager.isSubscribed())
+            castPlayerManager.subscribe(client, !castPlayerManager.isSubscribed());
         } else {
           plexSubscription.subscribe(client, !plexSubscription.isSubscribed());
         }

mobile/src/main/java/com/atomjack/vcfp/fragments/PlayerFragment.java

@@ -651,17 +651,19 @@ public void onStartTrackingTouch(SeekBar seekBar) {
   }
 
   public void setState(PlayerState newState) {
-    currentState = newState;
-    if(playPauseSpinner != null && playButton != null && pauseButton != null) {
-      playPauseSpinner.setVisibility(View.INVISIBLE);
-      playButton.setVisibility(View.INVISIBLE);
-      pauseButton.setVisibility(View.INVISIBLE);
-      if (currentState == PlayerState.PAUSED) {
-        playButton.setVisibility(View.VISIBLE);
-      } else if (currentState == PlayerState.PLAYING) {
-        pauseButton.setVisibility(View.VISIBLE);
-      } else {
-        playPauseSpinner.setVisibility(View.VISIBLE);
+    if(currentState != newState) {
+      currentState = newState;
+      if (playPauseSpinner != null && playButton != null && pauseButton != null) {
+        playPauseSpinner.setVisibility(View.INVISIBLE);
+        playButton.setVisibility(View.INVISIBLE);
+        pauseButton.setVisibility(View.INVISIBLE);
+        if (currentState == PlayerState.PAUSED) {
+          playButton.setVisibility(View.VISIBLE);
+        } else if (currentState == PlayerState.PLAYING) {
+          pauseButton.setVisibility(View.VISIBLE);
+        } else {
+          playPauseSpinner.setVisibility(View.VISIBLE);
+        }
       }
     }
   }