Fixes for setting streams. Fixed finding server connection so the active connection is set to expire at the correct time. Always attempt to get transient token.

Author: Chris Bellew

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

@@ -773,8 +773,6 @@ public static QueryString getPlaybackQueryString(PlexMedia media,
     qs.add("port", connection.port);
     qs.add("address", connection.address);
 
-    if (resumePlayback && media.viewOffset != null)
-      qs.add("viewOffset", media.viewOffset);
     if (transientToken != null)
       qs.add("token", transientToken);
     if (media.server.accessToken != null)

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

@@ -176,11 +176,12 @@ public void setStream(Stream stream) {
       } else if (stream.streamType == Stream.SUBTITLE) {
         qs.put("subtitleStreamID", stream.id);
       }
-      Call<PlexResponse> call = service.setStreams(qs);
+      Call<PlexResponse> call = service.setStreams(qs, "0", VoiceControlForPlexApplication.getInstance().getUUID());
       call.enqueue(new Callback<PlexResponse>() {
         @Override
         public void onResponse(Response<PlexResponse> response) {
-          Logger.d("setStream response: %s", response.body().status);
+          if(response.body() != null)
+            Logger.d("setStream response: %s", response.body().status);
         }
 
         @Override

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

@@ -18,6 +18,7 @@
 
 import org.simpleframework.xml.Root;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
@@ -178,10 +179,14 @@ public PlexServer[] newArray(int size) {
 	};
 
   public void findServerConnection(final ActiveConnectionHandler activeConnectionHandler) {
-    if(activeConnectionExpires != null && activeConnectionExpires.before(Calendar.getInstance())) {
+    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("EEEE, MMMM d, yyyy 'at' h:mm:ss a");
+     Logger.d("[PlexServer] finding server connection for %s, current active connection expires: %s, now: %s",
+             name,
+             simpleDateFormat.format(activeConnectionExpires.getTime()),
+             simpleDateFormat.format(Calendar.getInstance().getTime()));
+    if(activeConnectionExpires != null && !activeConnectionExpires.before(Calendar.getInstance())) {
       activeConnectionHandler.onSuccess(activeConnection);
     } else {
-      Logger.d("[PlexServer] finding server connection for %s, current active connection expires: %s, number of connections: %d", name, activeConnectionExpires, connections.size());
       findServerConnection(0, activeConnectionHandler);
     }
   }
@@ -194,8 +199,9 @@ public void onFinish(int statusCode, boolean available) {
         if (available) {
           // This connection replied, so let's use it
           activeConnection = connections.get(connectionIndex);
+          Logger.d("Found connection for %s: %s", name, activeConnection);
           activeConnectionExpires = Calendar.getInstance();
-          activeConnectionExpires.set(Calendar.HOUR, 1);
+          activeConnectionExpires.add(Calendar.HOUR_OF_DAY, 1);
           VoiceControlForPlexApplication.servers.put(name, PlexServer.this);
           VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.SAVED_SERVERS, VoiceControlForPlexApplication.gsonWrite.toJson(VoiceControlForPlexApplication.servers));
           activeConnectionHandler.onSuccess(activeConnection);

mobile/src/main/java/com/atomjack/vcfp/net/PlexHttpClient.java

@@ -98,7 +98,7 @@ Call<PlexResponse> adjustPlayback(@Path(value="which", encoded=true) String whic
 
     @GET("/player/playback/seekTo")
     Call<PlexResponse> seekTo(@Query("offset") int offset,
-                              @Query("commandID") String commandId,
+                              @Query(PlexHeaders.commandID) String commandId,
                               @retrofit.http.Header(PlexHeaders.XPlexClientIdentifier) String clientId);
 
     @GET("/library/sections")
@@ -108,7 +108,9 @@ Call<PlexResponse> seekTo(@Query("offset") int offset,
     Call<MediaContainer> getResources(@Query(PlexHeaders.XPlexToken) String accessToken);
 
     @GET("/player/playback/setStreams")
-    Call<PlexResponse> setStreams(@QueryMap Map<String, String> options);
+    Call<PlexResponse> setStreams(@QueryMap Map<String, String> options,
+                                  @Query(PlexHeaders.commandID) String commandId,
+                                  @retrofit.http.Header(PlexHeaders.XPlexClientIdentifier) String clientId);
 
     @GET("/users/account.xml")
     Call<PlexUser> getPlexAccount(@retrofit.http.Header(PlexHeaders.XPlexToken) String authToken);
@@ -259,12 +261,20 @@ public void onFailure(int statusCode) {
     });
   }
 
-	public static void get(final PlexServer server, final String path, final PlexHttpMediaContainerHandler responseHandler) {
+  public static void getDebug(final PlexServer server, final String path, final PlexHttpMediaContainerHandler responseHandler) {
+    get(server, path, true, responseHandler);
+  }
+
+  public static void get(final PlexServer server, final String path, final PlexHttpMediaContainerHandler responseHandler) {
+    get(server, path, false, responseHandler);
+  }
+
+	public static void get(final PlexServer server, final String path, final boolean debug, final PlexHttpMediaContainerHandler responseHandler) {
     server.findServerConnection(new ActiveConnectionHandler() {
       @Override
       public void onSuccess(Connection connection) {
 
-        PlexHttpService service = getService(connection.uri);
+        PlexHttpService service = getService(connection.uri, debug);
 //        Logger.d("using path %s %s", connection.uri, path.substring(1));
         Call<MediaContainer> call = service.getMediaContainer(path.substring(1), server.accessToken);
         call.enqueue(new Callback<MediaContainer>() {
@@ -431,8 +441,16 @@ public void onFailure(Throwable t) {
     });
   }
 
+  public static void getDebug(String baseHostname, String path, final PlexHttpResponseHandler responseHandler) {
+    get(baseHostname, path, true, responseHandler);
+  }
+
   public static void get(String baseHostname, String path, final PlexHttpResponseHandler responseHandler) {
-    PlexHttpService service = getService(baseHostname);
+    get(baseHostname, path, false, responseHandler);
+  }
+
+  public static void get(String baseHostname, String path, boolean debug, final PlexHttpResponseHandler responseHandler) {
+    PlexHttpService service = getService(baseHostname, debug);
     Call<PlexResponse> call = service.getPlexResponse(VoiceControlForPlexApplication.getInstance().prefs.getUUID(),
             path.replaceFirst("^/", ""));
     call.enqueue(new Callback<PlexResponse>() {

mobile/src/main/java/com/atomjack/vcfp/services/PlexSearchService.java

@@ -1203,23 +1203,19 @@ private void playMedia(final PlexMedia media) {
   }
 
   private void playMedia(final PlexMedia media, final PlexDirectory album) {
-		if(media.server.owned)
-			createPlayQueueAndPlayMedia(media, album, null);
-		else {
-			// TODO: switch this to the PlexServer method and verify
-			requestTransientAccessToken(media.server, new AfterTransientTokenRequest() {
-				@Override
-				public void success(String token) {
-					createPlayQueueAndPlayMedia(media, album, token);
-				}
+    // TODO: switch this to the PlexServer method and verify
+    requestTransientAccessToken(media.server, new AfterTransientTokenRequest() {
+      @Override
+      public void success(String token) {
+        createPlayQueueAndPlayMedia(media, album, token);
+      }
 
-				@Override
-				public void failure() {
-					// Just try to play without a transient token
-					createPlayQueueAndPlayMedia(media, album, null);
-				}
-			});
-		}
+      @Override
+      public void failure() {
+        // Just try to play without a transient token
+        createPlayQueueAndPlayMedia(media, album, null);
+      }
+    });
 	}
 
   private void playAllFromArtist(final PlexDirectory artist) {