Check for Cast subscription before canceling notification.

Author: Chris Bellew

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

@@ -64,6 +64,7 @@ public static final class PARAMS {
     public static final String ACTION_PREV = "prev";
 
     public static final String PLEX_USERNAME = "plexUsername";
+    public static final String ACCESS_TOKEN = "accessToken";
 
   };
 
@@ -426,6 +427,7 @@ public JSONObject buildMedia(Connection connection, int offset) {
       data.put(PARAMS.RESUME, VoiceControlForPlexApplication.getInstance().prefs.get(Preferences.RESUME, false));
       data.put(PARAMS.CLIENT, VoiceControlForPlexApplication.gsonWrite.toJson(mClient));
       data.put(PARAMS.SRC, getTranscodeUrl(nowPlayingMedia, connection, offset));
+      data.put(PARAMS.ACCESS_TOKEN, nowPlayingMedia.server.accessToken);
       data.put(PARAMS.PLAYLIST, getPlaylistJson());
     } catch (Exception ex) {
       ex.printStackTrace();

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

@@ -150,9 +150,13 @@ protected void onCreate(Bundle savedInstanceState) {
     feedback = new Feedback(this);
 
     plexSubscription = VoiceControlForPlexApplication.getInstance().plexSubscription;
+    castPlayerManager = VoiceControlForPlexApplication.getInstance().castPlayerManager;
     if(plexSubscription.isSubscribed()) {
-      Logger.d("VCFPActivity setting client to %s", plexSubscription.mClient);
+      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 {
       Logger.d("Not subscribed: %s", plexSubscription.mClient);
       // In case the notification is still up due to a crash
@@ -164,11 +168,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
     currentNetworkState = NetworkState.getCurrentNetworkState(this);
 
-    castPlayerManager = VoiceControlForPlexApplication.getInstance().castPlayerManager;
+
     castPlayerManager.setContext(this);
-    if(castPlayerManager.isSubscribed()) {
-      mClient = castPlayerManager.mClient;
-    }
 
 		if(BuildConfig.USE_BUGSENSE)
 			BugSenseHandler.initAndStartSession(getApplicationContext(), BUGSENSE_APIKEY);

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

@@ -33,6 +33,8 @@ public class PlexVideo extends PlexMedia {
   @Attribute(required=false)
   public String originallyAvailableAt;
   public String showTitle;
+  @Attribute(required=false)
+  public String guid;
 
 	public Date airDate() {
     SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@@ -112,6 +114,7 @@ public void writeToParcel(Parcel out, int flags) {
 		out.writeString(originallyAvailableAt);
 		out.writeString(showTitle);
 		out.writeTypedList(genre);
+    out.writeString(guid);
 	}
 
 	public PlexVideo(Parcel in) {
@@ -125,6 +128,7 @@ public PlexVideo(Parcel in) {
 		showTitle = in.readString();
     genre = new ArrayList<Genre>();
 		in.readTypedList(genre, Genre.CREATOR);
+    guid = in.readString();
 	}
 
 	public int describeContents() {