When resuming app, if subscribed to a plex client and it's been more than 60 seconds since the last heartbeat was received, resubscribe to the client.

Author: Chris Bellew

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

@@ -29,6 +29,7 @@
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -59,6 +60,8 @@ public class PlexSubscription {
   private int failedHeartbeats = 0;
   private final int failedHeartbeatMax = 5;
 
+  private Calendar lastHeartbeatResponded;
+
   private Handler mHandler;
 
   private PlayerState currentState = PlayerState.STOPPED;
@@ -244,6 +247,11 @@ public void run() {
     serverThread.start();
   }
 
+  public void resubscribe() {
+    if(mClient != null)
+      subscribe(mClient);
+  }
+
   public void subscribe(final PlexClient client) {
     Logger.d("PlexSubscription subscribe: %s, handler is null: %s", client, updateConversationHandler == null);
     if(updateConversationHandler == null)
@@ -284,6 +292,8 @@ public void onSuccess(PlexResponse response) {
             mHandler.removeCallbacks(subscriptionHeartbeat);
             mHandler.postDelayed(subscriptionHeartbeat, SUBSCRIBE_INTERVAL);
             onSubscribed();
+          } else {
+            lastHeartbeatResponded = Calendar.getInstance();
           }
         }
       }
@@ -537,4 +547,7 @@ public void subtitlesOff() {
     nowPlayingMedia.setActiveStream(nowPlayingMedia.getStreams(Stream.SUBTITLE).get(0));
   }
 
+  public Calendar getLastHeartbeatResponded() {
+    return lastHeartbeatResponded;
+  }
 }

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

@@ -117,7 +117,9 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.net.SocketTimeoutException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -540,6 +542,17 @@ protected void onResume() {
 
     plexSubscription.setListener(plexSubscriptionListener);
     castPlayerManager.setListener(plexSubscriptionListener);
+
+    if(plexSubscription.isSubscribed() && plexSubscription.getLastHeartbeatResponded() != null) {
+      Calendar cal = Calendar.getInstance();
+      SimpleDateFormat format = new SimpleDateFormat("EEEE, MMMM d, yyyy 'at' h:mm:ss a");
+      cal.add(Calendar.SECOND, -60);
+      if(plexSubscription.getLastHeartbeatResponded().before(cal)) {
+        Logger.d("It's been more than 60 seconds since last heartbeat responded. now: %s, last heartbeat responded: %s", format.format(Calendar.getInstance().getTime()), format.format(plexSubscription.getLastHeartbeatResponded().getTime()));
+        plexSubscription.resubscribe();
+      }
+    }
+
     if(!doingFirstTimeSetup) {
       mDrawer.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
     } else