Account for OpenPHT returning incorrect Timeline with state of playing after music playback is stopped. Since a new piece of media is fetched, onPlayStarted should not be called if a new stopped Timeline has been received before the previous incorrect Timeline is finished processing. Also added way to compare two instances of PlexMedia by key.

Author: Chris Bellew

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

@@ -4,6 +4,7 @@
 import android.os.Handler;
 
 import com.atomjack.shared.Logger;
+import com.atomjack.shared.NewLogger;
 import com.atomjack.shared.PlayerState;
 import com.atomjack.shared.model.Timeline;
 import com.atomjack.vcfp.interfaces.PlexMediaHandler;
@@ -41,6 +42,7 @@
 import java.util.regex.Pattern;
 
 public class PlexSubscription {
+  private NewLogger logger;
   private static final int SUBSCRIBE_INTERVAL = 30000; // Send subscribe message every 30 seconds to keep us alive
 
   private static Serializer serial = new Persister();
@@ -74,6 +76,7 @@ public class PlexSubscription {
 
   public PlexSubscription() {
     mHandler = new Handler();
+    logger = new NewLogger(this);
   }
 
   public void setListener(PlexSubscriptionListener _listener) {
@@ -472,13 +475,15 @@ public void onSuccess(MediaContainer playlistMediaContainer) {
                     if(media != null) {
                       if(nowPlayingMedia != null) // if we're already playing media, this new media we found is different, so notify the listener
                         listener.onMediaChanged(media, PlayerState.getState(timeline));
-                      else
+                      else if(currentState != PlayerState.STOPPED){ // edge case where we receive a new timeline with a state of stopped after this one, but before this one has finished processing
                         listener.onPlayStarted(media, nowPlayingPlaylist, PlayerState.getState(timeline));
+                      }
                     } else {
                       // TODO: Handle not finding any media?
                     }
                     nowPlayingMedia = media;
-                    VoiceControlForPlexApplication.getInstance().setNotification(mClient, currentState, nowPlayingMedia, nowPlayingPlaylist);
+                    if(currentState != PlayerState.STOPPED)
+                      VoiceControlForPlexApplication.getInstance().setNotification(mClient, currentState, nowPlayingMedia, nowPlayingPlaylist);
                   }
 
                   @Override

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

@@ -715,6 +715,13 @@ protected void onResume() {
       }
     }
 
+    // If we get unsubscribed from the notification, and the app isn't visible, the next time we show up the app will think it's still subscribed, so we have to set the UI to be unsubbed
+    if(!isSubscribed()) {
+      switchToMainFragment();
+      setCastIconInactive();
+      prefs.remove(Preferences.SUBSCRIBED_CLIENT);
+    }
+
     if(musicPlayerIsBound)
       bindMusicPlayerService();
     if(musicPlayerFragment != null && musicPlayerFragment.isVisible())

mobile/src/main/java/com/atomjack/vcfp/model/PlexMedia.java

@@ -320,5 +320,17 @@ public String getImageKey(IMAGE_KEY imageKey) {
     }
   }
 
+  @Override
+  public boolean equals(Object o) {
+    return key.equals(((PlexMedia)o).key);
+  }
+
+  @Override
+  public int hashCode() {
+    final int prime = 37;
+    int result = 1;
+    result = prime * result + ((key == null) ? 0 : key.hashCode());
+    return result;
+  }
 }