When stopping playback, need to compare clients properly to determine if we should unsubscribe from the client we just got done playing to.

Author: Chris Bellew

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

@@ -412,12 +412,13 @@ public void onStateChanged(PlexMedia media, PlayerState state) {
       handler.removeCallbacks(autoDisconnectPlayerTimer);
       if(playerFragment != null && playerFragment.isVisible()) {
         if(state == PlayerState.STOPPED) {
-          logger.d("onStopped");
           VoiceControlForPlexApplication.getInstance().cancelNotification();
           switchToMainFragment();
-          if(plexSubscription.isSubscribed() && plexSubscription.getClient() != gsonRead.fromJson(prefs.get(Preferences.CLIENT, ""), PlexClient.class))
+          // We've stopped, so if we're still subscribed and the client we stopped playing to is different from the default client, unsubscribe, since
+          // the main screen UI says it is ready to cast to the default client, not the client we just got finished playing to.
+          if(plexSubscription.isSubscribed() && !plexSubscription.getClient().equals(gsonRead.fromJson(prefs.get(Preferences.CLIENT, ""), PlexClient.class)))
             plexSubscription.unsubscribe();
-          if(castPlayerManager.isSubscribed() && castPlayerManager.getClient() != gsonRead.fromJson(prefs.get(Preferences.CLIENT, ""), PlexClient.class))
+          if(castPlayerManager.isSubscribed() && !castPlayerManager.getClient().equals(gsonRead.fromJson(prefs.get(Preferences.CLIENT, ""), PlexClient.class)))
             castPlayerManager.unsubscribe();
         } else {
           playerFragment.setState(state);

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

@@ -47,6 +47,7 @@ public static PlexClient getLocalPlaybackClient() {
     client.isLocalClient = true;
     client.name = VoiceControlForPlexApplication.getInstance().getString(R.string.this_device);
     client.product = VoiceControlForPlexApplication.getInstance().getString(R.string.app_name);
+    client.machineIdentifier = VoiceControlForPlexApplication.getInstance().getUUID();
     return client;
   }
 

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

@@ -40,6 +40,29 @@ public PlexDevice() {
   }
 
 
+  @Override
+  public boolean equals(Object o) {
+    if(this == o)
+      return true;
+    if(o == null)
+      return false;
+    if(getClass() != o.getClass())
+      return false;
+    PlexDevice other = (PlexDevice)o;
+    if(machineIdentifier == null) {
+      if (other.machineIdentifier != null)
+        return false;
+    } else if(!machineIdentifier.equals(other.machineIdentifier))
+      return false;
+    return true;
+  }
 
+  @Override
+  public int hashCode() {
+    final int prime = 67;
+    int result = 1;
+    result = prime * result + ((machineIdentifier == null) ? 0 : machineIdentifier.hashCode());
+    return result;
+  }
 
 }