Fixed crash caused by watching media on a client when already subscribed to another client, caused by switching to the main fragment on resume when we're not subscribed (needed behavior when unsubscribing via the notification). The fix was to not switch back to the main fragment if we're in the process of subscribing, since the app gets launched before subscribing to the client is finished.

Author: Chris Bellew

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

@@ -119,6 +119,7 @@ public static final class RECEIVER_EVENTS {
 //  private CastListener listener;
 
   private boolean subscribed = false;
+  private boolean subscribing = false;
 
   public PlexClient mClient;
 
@@ -137,9 +138,8 @@ public void setContext(Context context) {
     mContext = context;
   }
 
-
-
   public void subscribe(final PlexClient _client, boolean showFeedback) {
+    subscribing = true;
     subscribe(_client, null, showFeedback);
   }
 
@@ -160,6 +160,7 @@ public void subscribe(final PlexClient _client, final Runnable onFinished, final
       @Override
       public void run() {
         mClient = _client;
+
 //        currentState = castManager.getPlaybackStatus();
         Logger.d("castConsumer connected to %s", mClient.name);
         getPlaybackState();
@@ -188,7 +189,7 @@ public void run() {
         } catch (Exception ex) {}
 
 
-
+        subscribing = false;
         subscribed = true;
         if(listener != null)
           listener.onSubscribed(_client, showFeedback);
@@ -206,6 +207,14 @@ public boolean isSubscribed() {
     return subscribed && mClient != null;
   }
 
+  public boolean isSubscribing() {
+    return subscribing;
+  }
+
+  public PlexClient getClient() {
+    return mClient;
+  }
+
   public void unsubscribe() {
     try {
       Logger.d("is connected: %s", castManager.isConnected());

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

@@ -55,6 +55,7 @@ public class PlexSubscription {
   private int commandId = 1;
   private int subscriptionPort = 59409;
   private boolean subscribed = false;
+  private boolean subscribing = false;
   private ServerSocket serverSocket;
   Thread serverThread = null;
   Handler updateConversationHandler;
@@ -105,6 +106,10 @@ public boolean isSubscribed() {
     return subscribed && mClient != null;
   }
 
+  public boolean isSubscribing() {
+    return subscribing;
+  }
+
   class ServerThread implements Runnable {
     Runnable onReady;
 
@@ -260,6 +265,7 @@ public void resubscribe() {
 
   public void subscribe(final PlexClient client, boolean showFeedback) {
     Logger.d("PlexSubscription subscribe: %s, handler is null: %s", client, updateConversationHandler == null);
+    subscribing = true;
     if(updateConversationHandler == null)
       startSubscription(client, showFeedback);
     else
@@ -274,6 +280,7 @@ public void subscribe(PlexClient client, final boolean isHeartbeat, final boolea
     PlexHttpClient.subscribe(client, subscriptionPort, commandId, VoiceControlForPlexApplication.getInstance().getUUID(), VoiceControlForPlexApplication.getInstance().getString(R.string.app_name), new PlexHttpResponseHandler() {
       @Override
       public void onSuccess(PlexResponse response) {
+        subscribing = false;
         failedHeartbeats = 0;
         if(!isHeartbeat)
           Logger.d("PlexSubscription: Subscribed: %s, Code: %d", response != null ? response.status : "", response.code);
@@ -307,6 +314,7 @@ public void onSuccess(PlexResponse response) {
       @Override
       public void onFailure(final Throwable error) {
         error.printStackTrace();
+        subscribing = false;
         if(isHeartbeat) {
           failedHeartbeats++;
           Logger.d("%d failed heartbeats", failedHeartbeats);

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

@@ -399,7 +399,6 @@ public void onPlayStarted(PlexMedia media, ArrayList<? extends PlexMedia> playli
       logger.d("onPlayStarted: %s", media.getTitle());
       handler.removeCallbacks(autoDisconnectPlayerTimer);
       int layout = getLayoutForMedia(media, state);
-      logger.d("layout: %d", layout);
       if(layout != -1) {
         playerFragment.init(layout, client, media, playlist, false);
         switchToPlayerFragment();
@@ -416,6 +415,10 @@ public void onStateChanged(PlexMedia media, PlayerState state) {
           logger.d("onStopped");
           VoiceControlForPlexApplication.getInstance().cancelNotification();
           switchToMainFragment();
+          if(plexSubscription.isSubscribed() && plexSubscription.getClient() != gsonRead.fromJson(prefs.get(Preferences.CLIENT, ""), PlexClient.class))
+            plexSubscription.unsubscribe();
+          if(castPlayerManager.isSubscribed() && castPlayerManager.getClient() != gsonRead.fromJson(prefs.get(Preferences.CLIENT, ""), PlexClient.class))
+            castPlayerManager.unsubscribe();
         } else {
           playerFragment.setState(state);
         }
@@ -607,6 +610,8 @@ protected void onPause() {
     super.onPause();
     logger.d("onPause");
     handler.removeCallbacks(autoDisconnectPlayerTimer);
+    plexSubscription.setListener(null);
+    castPlayerManager.setListener(null);
     VoiceControlForPlexApplication.applicationPaused();
     if (isFinishing() && mMediaRouter != null) {
       mMediaRouter.removeCallback(mMediaRouterCallback);
@@ -725,8 +730,10 @@ 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() && !doingFirstTimeSetup) {
+    // it's still subscribed, so we have to set the UI to be unsubbed. Also, need to make sure we're not in the middle of subscribing,
+    // as that will happen when a voice search is done to play something - this activity will be launched before the subscribe
+    // process is done. If this isn't checked, we end up switching to the main fragment when we should stay with the player fragment, and crash.
+    if(!isSubscribed() && !isSubscribing() && !doingFirstTimeSetup) {
       switchToMainFragment();
       setCastIconInactive();
       prefs.remove(Preferences.SUBSCRIBED_CLIENT);
@@ -1685,6 +1692,10 @@ private boolean isSubscribed() {
     return plexSubscription.isSubscribed() || castPlayerManager.isSubscribed() || VoiceControlForPlexApplication.getInstance().localClientSubscription.subscribed;
   }
 
+  private boolean isSubscribing() {
+    return plexSubscription.isSubscribing() || castPlayerManager.isSubscribing();
+  }
+
   private Runnable onClientRefreshFinished = null;
   private Runnable onServerRefreshFinished = null;
 

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

@@ -173,7 +173,6 @@ public void init(int layout, PlexClient client, PlexMedia media, ArrayList<? ext
     this.client = client;
     nowPlayingMedia = media;
     nowPlayingPlaylist = playlist == null ? new ArrayList<PlexMedia>() : playlist;
-    logger.d("Got %d items in playlist", playlist.size());
     this.fromWear = fromWear;
     currentMediaIndex = 0;
   }
@@ -306,12 +305,12 @@ public void onGlobalLayout() {
 
   @Override
   public void onResume() {
+    super.onResume();
     logger.d("onResume");
     if(doingMic) {
       doPlay();
       doingMic = false;
     }
-    super.onResume();
   }
 
   private void setThumb(final byte[] bytes) {
@@ -651,27 +650,17 @@ public void onStartTrackingTouch(SeekBar seekBar) {
   }
 
   public void setState(PlayerState newState) {
-    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);
-        }
-      }
+//    logger.d("setState: %s, current state: %s", newState, currentState);
+    currentState = newState;
+    if (playPauseSpinner != null && playButton != null && pauseButton != null) {
+      playPauseSpinner.setVisibility(currentState == PlayerState.BUFFERING ? View.VISIBLE : View.INVISIBLE);
+      playButton.setVisibility(currentState == PlayerState.PAUSED ? View.VISIBLE : View.INVISIBLE);
+      pauseButton.setVisibility(currentState == PlayerState.PLAYING ? View.VISIBLE : View.INVISIBLE);
     }
   }
 
   public void setPosition(int position) {
     if(!isSeeking) {
-//      if(position != this.position)
-//        logger.d("setting position to %d", position);
       this.position = position;
       if (seekBar != null)
         seekBar.setProgress(position);