When finding an active connection, re-save the server to the master list of servers so that connection is used the next time around, and use the server from the master list if it is the server to be used in a voice query. Use media type when seeking (seems to be needed for Roku).

Author: Chris Bellew

mobile/src/main/java/com/atomjack/vcfp/fragments/PlayerFragment.java

@@ -529,7 +529,11 @@ public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float ve
   }
 
   protected int getOrientation() {
-    return getResources().getConfiguration().orientation;
+
+    try {
+      return getResources().getConfiguration().orientation;
+    } catch (Exception e) {}
+    return Configuration.ORIENTATION_PORTRAIT;
   }
 
   // The follow methods are defined in the PlexPlayerFragment and CastPlayerFragment subclasses

mobile/src/main/java/com/atomjack/vcfp/fragments/PlexPlayerFragment.java

@@ -26,14 +26,14 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
   @Override
   protected void doRewind() {
     if(position > -1) {
-      client.seekTo((position * 1000) - 15000, null);
+      client.seekTo((position * 1000) - 15000, nowPlayingMedia.isMusic() ? "music" : "video", null);
     }
   }
 
   @Override
   protected void doForward() {
     if(position > -1) {
-      client.seekTo((position * 1000) + 30000, null);
+      client.seekTo((position * 1000) + 30000, nowPlayingMedia.isMusic() ? "music" : "video", null);
     }
   }
 
@@ -63,7 +63,7 @@ protected void doPrevious() {
 
   @Override
   public void onStopTrackingTouch(SeekBar _seekBar) {
-    client.seekTo(_seekBar.getProgress()*1000, new PlexHttpResponseHandler() {
+    client.seekTo(_seekBar.getProgress()*1000, nowPlayingMedia.isMusic() ? "music" : "video", new PlexHttpResponseHandler() {
       @Override
       public void onSuccess(PlexResponse response) {
         isSeeking = false;

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

@@ -80,8 +80,8 @@ public PlexClient[] newArray(int size) {
 		}
 	};
 
-	public void seekTo(int offset, PlexHttpResponseHandler responseHandler) {
-		PlexHttpClient.get(String.format("http://%s:%s", address, port), String.format("player/playback/seekTo?commandID=0&offset=%s", offset), responseHandler);
+	public void seekTo(int offset, String type, PlexHttpResponseHandler responseHandler) {
+		PlexHttpClient.get(String.format("http://%s:%s", address, port), String.format("player/playback/seekTo?commandID=0&type=%s&offset=%s", type, offset), responseHandler);
 	}
 
   public void pause(PlexHttpResponseHandler responseHandler) {

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

@@ -181,7 +181,7 @@ public void findServerConnection(final ActiveConnectionHandler activeConnectionH
     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());
+      Logger.d("[PlexServer] finding server connection for %s, current active connection expires: %s, number of connections: %d", name, activeConnectionExpires, connections.size());
       findServerConnection(0, activeConnectionHandler);
     }
   }
@@ -196,6 +196,8 @@ public void onFinish(int statusCode, boolean available) {
           activeConnection = connections.get(connectionIndex);
           activeConnectionExpires = Calendar.getInstance();
           activeConnectionExpires.set(Calendar.HOUR, 1);
+          VoiceControlForPlexApplication.servers.put(name, PlexServer.this);
+          VoiceControlForPlexApplication.getInstance().prefs.put(Preferences.SAVED_SERVERS, VoiceControlForPlexApplication.gsonWrite.toJson(VoiceControlForPlexApplication.servers));
           activeConnectionHandler.onSuccess(activeConnection);
         } else {
           int newConnectionIndex = connectionIndex + 1;

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

@@ -334,13 +334,21 @@ private void startup() {
 			// got a specified server and client from a shortcut
 			Logger.d("Got hardcoded server and client from shortcut with %d music sections", specifiedServer.musicSections.size());
 			plexmediaServers = new ConcurrentHashMap<>();
-			plexmediaServers.put(specifiedServer.name, specifiedServer);
+      // If the chosen server exists in the master list of servers, use that one as it will have the last time a connection scan was done
+      if(VoiceControlForPlexApplication.servers.containsKey(specifiedServer.name))
+        plexmediaServers.put(specifiedServer.name, VoiceControlForPlexApplication.servers.get(specifiedServer.name));
+      else
+  			plexmediaServers.put(specifiedServer.name, specifiedServer);
 			setClient();
 		} else if(specifiedServer == null && defaultServer != null && !defaultServer.name.equals(getResources().getString(R.string.scan_all))) {
 			// Use the server specified in the main settings
 			Logger.d("Using server and client specified in main settings");
 			plexmediaServers = new ConcurrentHashMap<>();
-			plexmediaServers.put(defaultServer.name, defaultServer);
+      // If the chosen server exists in the master list of servers, use that one as it will have the last time a connection scan was done
+      if(VoiceControlForPlexApplication.servers.containsKey(defaultServer.name))
+        plexmediaServers.put(defaultServer.name, VoiceControlForPlexApplication.servers.get(defaultServer.name));
+      else
+  			plexmediaServers.put(defaultServer.name, defaultServer);
 			setClient();
 		} else {
 			// Scan All was chosen
@@ -993,7 +1001,7 @@ private void seekTo(int offset) {
     if(client.isCastClient) {
       castPlayerManager.seekTo(offset / 1000);
     } else {
-      client.seekTo(offset, new PlexHttpResponseHandler() {
+      client.seekTo(offset, plexSubscription.getNowPlayingMedia().isMusic() ? "music" : "video", new PlexHttpResponseHandler() {
         @Override
         public void onSuccess(PlexResponse r) {
           Boolean passed = true;