Don't switch to main screen on resume when first time setup isn't done yet.

Author: Chris Bellew

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

@@ -716,7 +716,7 @@ 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()) {
+    if(!isSubscribed() && !doingFirstTimeSetup) {
       switchToMainFragment();
       setCastIconInactive();
       prefs.remove(Preferences.SUBSCRIBED_CLIENT);

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

@@ -322,7 +322,19 @@ public String getImageKey(IMAGE_KEY imageKey) {
 
   @Override
   public boolean equals(Object o) {
-    return key.equals(((PlexMedia)o).key);
+    if(this == o)
+      return true;
+    if(o == null)
+      return false;
+    if(getClass() != o.getClass())
+      return false;
+    PlexMedia other = (PlexMedia)o;
+    if(key == null) {
+      if (other.key != null)
+        return false;
+    } else if(!key.equals(other.key))
+      return false;
+    return true;
   }
 
   @Override