Automatically resubscribe to a client on startup if the client was never unsubscribed from (in the event of a crash).

Author: Chris Bellew

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

@@ -152,13 +152,19 @@ protected void onCreate(Bundle savedInstanceState) {
 
     plexSubscription = VoiceControlForPlexApplication.getInstance().plexSubscription;
     castPlayerManager = VoiceControlForPlexApplication.getInstance().castPlayerManager;
-    if(plexSubscription.isSubscribed()) {
-      Logger.d("[VCFPActivity] setting client to %s", plexSubscription.mClient);
-      mClient = plexSubscription.mClient;
-    } else if(castPlayerManager.isSubscribed()) {
-      Logger.d("[VCFPActivity] setting client to %s", castPlayerManager.mClient);
-      mClient = castPlayerManager.mClient;
-    } else {
+
+    if(gsonRead.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SUBSCRIBED_CLIENT, ""), PlexClient.class) != null) {
+      mClient = gsonRead.fromJson(VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.SUBSCRIBED_CLIENT, ""), PlexClient.class);
+      if(mClient.isCastClient) {
+        if(!castPlayerManager.isSubscribed()) {
+          castPlayerManager.subscribe(mClient);
+        }
+      } else if(!plexSubscription.isSubscribed()) {
+        plexSubscription.subscribe(mClient);
+      }
+    }
+
+    if(!plexSubscription.isSubscribed() && !castPlayerManager.isSubscribed()) {
       Logger.d("Not subscribed: %s", plexSubscription.mClient);
       // In case the notification is still up due to a crash
       VoiceControlForPlexApplication.getInstance().cancelNotification();
@@ -449,6 +455,8 @@ public void onSubscribed(PlexClient _client) {
     Logger.d("VCFPActivity: onSubscribed: %s", _client);
     mClient = _client;
 
+    VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.SUBSCRIBED_CLIENT, gsonWrite.toJson(_client));
+
 		subscribing = false;
     try {
       setCastIconActive();
@@ -613,6 +621,7 @@ public void onUnsubscribed() {
     setCastIconInactive();
     nowPlayingMedia = null;
     VoiceControlForPlexApplication.getInstance().cancelNotification();
+    VoiceControlForPlexApplication.getInstance().prefs.remove(Preferences.SUBSCRIBED_CLIENT);
     sendWearPlaybackChange();
     feedback.m(R.string.disconnected);
   }

shared/src/main/java/com/atomjack/shared/Preferences.java

@@ -26,6 +26,7 @@ public class Preferences {
   public final static String NUM_CINEMA_TRAILERS = "pref.num_cinema_trailers";
   public final static String CHROMECAST_VIDEO_QUALITY_LOCAL = "pref.chromecast_video_quality_local";
   public final static String CHROMECAST_VIDEO_QUALITY_REMOTE = "pref.chromecast_video_quality_remote";
+  public final static String SUBSCRIBED_CLIENT = "pref.subscribed_client";
 
   public Preferences(Context context) {
     mPrefs = context.getSharedPreferences(PREFS, context.MODE_PRIVATE);