Don't show audio/subtitle stream selection row if there are no audio/subtitle streams for the playing media. Hide audio/subs button if no audio AND no subtitle streams. Show "Unknown" for title/language of a stream when both title and language are null.

Author: Chris Bellew

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

@@ -361,7 +361,7 @@ public void unsubscribe(final boolean notify, final Runnable onFinish) {
 //    if(listener == null)
 //      return;
 
-    PlexHttpClient.unsubscribe(mClient, commandId, VoiceControlForPlexApplication.getInstance().prefs.getUUID(), listener.getString(R.string.app_name), new PlexHttpResponseHandler() {
+    PlexHttpClient.unsubscribe(mClient, commandId, VoiceControlForPlexApplication.getInstance().prefs.getUUID(), VoiceControlForPlexApplication.getInstance().getString(R.string.app_name), new PlexHttpResponseHandler() {
       @Override
       public void onSuccess(PlexResponse response) {
         Logger.d("Unsubscribed");

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

@@ -96,44 +96,54 @@ public void doMediaOptions(View v) {
     LayoutInflater inflater = getLayoutInflater();
     View layout = inflater.inflate(R.layout.media_options_dialog, null);
 
-    Spinner subtitlesSpinner = (Spinner)layout.findViewById(R.id.subtitlesSpinner);
-    StreamAdapter subtitlesStreamAdapter = new StreamAdapter(this, android.R.layout.simple_spinner_dropdown_item, subtitleStreams);
-    subtitlesSpinner.setAdapter(subtitlesStreamAdapter);
-    subtitlesSpinner.setSelection(subtitleStreams.indexOf(nowPlayingMedia.getActiveStream(Stream.SUBTITLE)), false);
-
-    subtitlesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-      @Override
-      public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        Stream stream = subtitleStreams.get(position);
-        if(!stream.isActive()) {
-          mClient.setStream(stream);
-          nowPlayingMedia.setActiveStream(stream);
+    if(subtitleStreams.size() > 0) {
+      Spinner subtitlesSpinner = (Spinner) layout.findViewById(R.id.subtitlesSpinner);
+      StreamAdapter subtitlesStreamAdapter = new StreamAdapter(this, android.R.layout.simple_spinner_dropdown_item, subtitleStreams);
+      subtitlesSpinner.setAdapter(subtitlesStreamAdapter);
+      subtitlesSpinner.setSelection(subtitleStreams.indexOf(nowPlayingMedia.getActiveStream(Stream.SUBTITLE)), false);
+
+      subtitlesSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+          Stream stream = subtitleStreams.get(position);
+          if (!stream.isActive()) {
+            mClient.setStream(stream);
+            nowPlayingMedia.setActiveStream(stream);
+          }
         }
-      }
 
-      @Override
-      public void onNothingSelected(AdapterView<?> parent) {
-      }
-    });
-    Spinner audioSpinner = (Spinner)layout.findViewById(R.id.audioSpinner);
-    StreamAdapter audioStreamAdapter = new StreamAdapter(this, android.R.layout.simple_spinner_dropdown_item, audioStreams);
-    audioSpinner.setAdapter(audioStreamAdapter);
-    audioSpinner.setSelection(audioStreams.indexOf(nowPlayingMedia.getActiveStream(Stream.AUDIO)), false);
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+        }
+      });
+    } else {
+      layout.findViewById(R.id.subtitlesRow).setVisibility(View.GONE);
+    }
 
-    audioSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
-      @Override
-      public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
-        Stream stream = audioStreams.get(position);
-        if(!stream.isActive()) {
-          mClient.setStream(stream);
-          nowPlayingMedia.setActiveStream(stream);
+    if(audioStreams.size() > 0) {
+      Spinner audioSpinner = (Spinner) layout.findViewById(R.id.audioSpinner);
+      StreamAdapter audioStreamAdapter = new StreamAdapter(this, android.R.layout.simple_spinner_dropdown_item, audioStreams);
+      audioSpinner.setAdapter(audioStreamAdapter);
+      audioSpinner.setSelection(audioStreams.indexOf(nowPlayingMedia.getActiveStream(Stream.AUDIO)), false);
+
+      audioSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+          Stream stream = audioStreams.get(position);
+          if (!stream.isActive()) {
+            mClient.setStream(stream);
+            nowPlayingMedia.setActiveStream(stream);
+          }
         }
-      }
 
-      @Override
-      public void onNothingSelected(AdapterView<?> parent) {
-      }
-    });
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+        }
+      });
+    } else {
+      // For some reason, no audio streams found, so hide the row
+      layout.findViewById(R.id.audioRow).setVisibility(View.GONE);
+    }
 
     builder.setView(layout);
     builder.setTitle(getResources().getString(R.string.stream_selection));
@@ -256,6 +266,10 @@ public void showNowPlaying(boolean setView) {
     TextView nowPlayingOnClient = (TextView)findViewById(R.id.nowPlayingOnClient);
     nowPlayingOnClient.setText(getResources().getString(R.string.now_playing_on) + " " + mClient.name);
 
+    if(findViewById(R.id.mediaOptionsButton) != null && nowPlayingMedia.getStreams(Stream.SUBTITLE).size() == 0 && nowPlayingMedia.getStreams(Stream.AUDIO).size() == 0) {
+      findViewById(R.id.mediaOptionsButton).setVisibility(View.GONE);
+    }
+
     Logger.d("[PlayerActivity] Setting thumb in showNowPlaying");
     setThumb();
     attachUIElements();

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

@@ -35,7 +35,11 @@ public void setActive(boolean active) {
   }
 
   public String getTitle() {
-    return title != null ? title : language;
+    if(title != null)
+      return title;
+    if(language != null)
+      return language;
+    return VoiceControlForPlexApplication.getInstance().getString(R.string.unknown);
   }
 
   public static final int UNKNOWN = 0;

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

@@ -428,7 +428,7 @@ public void onFailure(Throwable t) {
   }
 
   public static void get(String baseHostname, String path, final PlexHttpResponseHandler responseHandler) {
-    PlexHttpService service = getService(baseHostname, true);
+    PlexHttpService service = getService(baseHostname);
     Call<PlexResponse> call = service.getPlexResponse(VoiceControlForPlexApplication.getInstance().prefs.getUUID(),
             path.replaceFirst("^/", ""));
     call.enqueue(new Callback<PlexResponse>() {

mobile/src/main/res/values/strings.xml

@@ -157,4 +157,5 @@
     <string name="unauthorized_local_server_found_logged_out">I found one or more local servers but was denied access. Log in to Plex (via the Menu button) to attempt to access this server.</string>
     <string name="unauthorized_local_server_found_logged_in">I found one or more local servers but was denied access. Since you are already logged in to Plex, either log out and back in (in case your access token has changed), or verify your access to this server/servers.</string>
     <string name="stream_selection">Stream Selection</string>
+    <string name="unknown">Unknown</string>
 </resources>