Fixed crash when playing video on chromecast that has no subtitle streams. Fixed display background of stream selection dialog. Removed references to now playing posters and art. Hopefully fixed resume patterns.

Chris Bellew · Chris Bellew · commit 223259a4ffa4 · 2016-02-26T16:41:51.000-08:00
diff --git a/mobile/src/main/java/com/atomjack/vcfp/CastPlayerManager.java b/mobile/src/main/java/com/atomjack/vcfp/CastPlayerManager.java
@@ -589,7 +589,8 @@ public JSONObject buildMedia(Connection connection, int offset) {
         data.put(PARAMS.SUBTITLE_SRC, getTranscodeUrl(nowPlayingMedia, connection, offset, true));
         data.put(PARAMS.AUDIO_STREAMS, VoiceControlForPlexApplication.gsonWrite.toJson(nowPlayingMedia.getStreams(Stream.AUDIO)));
         data.put(PARAMS.SUBTITLE_STREAMS, VoiceControlForPlexApplication.gsonWrite.toJson(nowPlayingMedia.getStreams(Stream.SUBTITLE)));
-        data.put(PARAMS.ACTIVE_SUBTITLE, nowPlayingMedia.getActiveStream(Stream.SUBTITLE).id);
+        if(nowPlayingMedia.getActiveStream(Stream.SUBTITLE) != null)
+          data.put(PARAMS.ACTIVE_SUBTITLE, nowPlayingMedia.getActiveStream(Stream.SUBTITLE).id);
       }
       data.put(PARAMS.ACCESS_TOKEN, nowPlayingMedia.server.accessToken);
       data.put(PARAMS.PLAYLIST, getPlaylistJson());
diff --git a/mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java b/mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java
@@ -348,7 +348,7 @@ public void onPlayStarted(PlexMedia media, PlayerState state) {
       int layout = getLayoutForMedia(media, state);
 
       if(layout != -1) {
-        playerFragment.init(layout, client, media, plexSubscriptionListener);
+        playerFragment.init(layout, client, media, false, plexSubscriptionListener);
         switchToFragment(playerFragment);
       }
       sendWearPlaybackChange(state, media);
@@ -952,7 +952,7 @@ private void handleShowNowPlayingIntent(Intent intent) {
     int layout = getLayoutForMedia(media, state);
     Logger.d("Layout: %d", layout);
     if(layout != -1) {
-      playerFragment.init(layout, client, media, plexSubscriptionListener);
+      playerFragment.init(layout, client, media, fromWear, plexSubscriptionListener);
       if(playerFragment.isVisible())
         playerFragment.mediaChanged(media);
       else
diff --git a/mobile/src/main/java/com/atomjack/vcfp/fragments/PlayerFragment.java b/mobile/src/main/java/com/atomjack/vcfp/fragments/PlayerFragment.java
@@ -8,6 +8,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.speech.RecognizerIntent;
 import android.support.annotation.Nullable;
@@ -32,35 +33,24 @@
 import com.atomjack.shared.Logger;
 import com.atomjack.shared.PlayerState;
 import com.atomjack.shared.Preferences;
-import com.atomjack.shared.SendToDataLayerThread;
 import com.atomjack.shared.WearConstants;
-import com.atomjack.shared.model.Timeline;
 import com.atomjack.vcfp.Feedback;
-import com.atomjack.vcfp.PlexHeaders;
 import com.atomjack.vcfp.R;
-import com.atomjack.vcfp.Utils;
 import com.atomjack.vcfp.VoiceControlForPlexApplication;
 import com.atomjack.vcfp.activities.MainActivity;
-import com.atomjack.vcfp.activities.VCFPActivity;
 import com.atomjack.vcfp.adapters.StreamAdapter;
 import com.atomjack.vcfp.interfaces.ActiveConnectionHandler;
 import com.atomjack.vcfp.interfaces.ActivityListener;
-import com.atomjack.vcfp.interfaces.BitmapHandler;
 import com.atomjack.vcfp.interfaces.InputStreamHandler;
-import com.atomjack.vcfp.interfaces.PlayerFragmentListener;
 import com.atomjack.vcfp.interfaces.PlexSubscriptionListener;
 import com.atomjack.vcfp.model.Connection;
-import com.atomjack.vcfp.model.MediaContainer;
 import com.atomjack.vcfp.model.PlexClient;
 import com.atomjack.vcfp.model.PlexMedia;
-import com.atomjack.vcfp.model.PlexServer;
 import com.atomjack.vcfp.model.PlexTrack;
 import com.atomjack.vcfp.model.PlexVideo;
 import com.atomjack.vcfp.model.Stream;
 import com.atomjack.vcfp.net.PlexHttpClient;
-import com.atomjack.vcfp.net.PlexHttpMediaContainerHandler;
 import com.atomjack.vcfp.services.PlexSearchService;
-import com.google.android.gms.wearable.DataMap;
 
 import org.apache.commons.io.IOUtils;
 
@@ -75,7 +65,6 @@
 
 public abstract class PlayerFragment extends Fragment
         implements SeekBar.OnSeekBarChangeListener {
-  protected PlayerFragmentListener playerFragmentListener;
   protected PlexMedia nowPlayingMedia;
   protected PlexClient client;
 
@@ -100,6 +89,8 @@ public abstract class PlayerFragment extends Fragment
   protected TextView durationDisplay;
   protected ImageView nowPlayingPoster;
 
+  protected boolean fromWear = false;
+
   protected GestureDetectorCompat mDetector;
 
   protected Dialog mediaOptionsDialog;
@@ -118,6 +109,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
     if(savedInstanceState != null) {
       Logger.d("[PlayerFragment] onSavedInstanceState is not null");
       nowPlayingMedia = savedInstanceState.getParcelable(Intent.EXTRA_MEDIA);
+      fromWear = savedInstanceState.getBoolean(WearConstants.FROM_WEAR, false);
       layout = savedInstanceState.getInt(Intent.EXTRA_LAYOUT);
       client = savedInstanceState.getParcelable(Intent.EXTRA_CLIENT);
     }
@@ -156,10 +148,11 @@ public PlayerFragment() {
     simpleDiskCache = VoiceControlForPlexApplication.getInstance().mSimpleDiskCache;
   }
 
-  public void init(int layout, PlexClient client, PlexMedia media, PlexSubscriptionListener plexSubscriptionListener) {
+  public void init(int layout, PlexClient client, PlexMedia media, boolean fromWear, PlexSubscriptionListener plexSubscriptionListener) {
     this.layout = layout;
     this.client = client;
     nowPlayingMedia = media;
+    this.fromWear = fromWear;
     this.plexSubscriptionListener = plexSubscriptionListener;
   }
 
@@ -290,7 +283,8 @@ public void showNowPlaying(boolean setView) {
       vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
         @Override
         public void onGlobalLayout() {
-          nowPlayingPosterContainer.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+          if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN)
+            nowPlayingPosterContainer.getViewTreeObserver().removeOnGlobalLayoutListener(this);
           int height = nowPlayingPosterContainer.getMeasuredHeight();
           int width = nowPlayingPosterContainer.getMeasuredWidth();
           Logger.d("Found dimensions: %d/%d", width, height);
@@ -556,7 +550,7 @@ protected void doMic() {
 
       SecureRandom random = new SecureRandom();
       serviceIntent.setData(Uri.parse(new BigInteger(130, random).toString(32)));
-      PendingIntent resultsPendingIntent = PendingIntent.getService(getActivity(), 0, serviceIntent, android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
+      PendingIntent resultsPendingIntent = PendingIntent.getService(getActivity(), 0, serviceIntent, PendingIntent.FLAG_ONE_SHOT);
 
       android.content.Intent listenerIntent = new android.content.Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
       listenerIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_FREE_FORM);
@@ -637,7 +631,6 @@ public void onNothingSelected(AdapterView<?> parent) {
     }
 
     builder.setView(layout);
-    builder.setTitle(getResources().getString(R.string.stream_selection));
     mediaOptionsDialog = builder.create();
     mediaOptionsDialog.show();
   }
diff --git a/mobile/src/main/java/com/atomjack/vcfp/interfaces/PlayerFragmentListener.java b/mobile/src/main/java/com/atomjack/vcfp/interfaces/PlayerFragmentListener.java
diff --git a/mobile/src/main/java/com/atomjack/vcfp/model/PlexMedia.java b/mobile/src/main/java/com/atomjack/vcfp/model/PlexMedia.java
@@ -214,7 +214,7 @@ public Stream getActiveStream(int streamType) {
         return stream;
     }
 
-    return streams.get(0);
+    return null;
   }
 
   public void setActiveStream(Stream s) {
diff --git a/mobile/src/main/res/layout-land/now_playing_music.xml b/mobile/src/main/res/layout-land/now_playing_music.xml
@@ -84,7 +84,7 @@
                 android:id="@+id/nowPlayingPoster"
                 android:layout_weight="1"
                 android:layout_gravity="right"
-                android:src="@drawable/bonobo2"/>
+                />
         </FrameLayout>
 
     </LinearLayout>
diff --git a/mobile/src/main/res/layout/media_options_dialog.xml b/mobile/src/main/res/layout/media_options_dialog.xml
@@ -2,7 +2,19 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent">
+              android:layout_height="match_parent"
+              android:background="@color/settings_popup_background">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="@string/stream_selection"
+        android:id="@+id/textView12"
+        android:textColor="@color/white"
+        android:layout_marginLeft="20dp"
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp"/>
 
     <LinearLayout
         android:orientation="horizontal"
@@ -20,7 +32,8 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/subtitlesSpinner"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:popupBackground="@color/settings_popup_background"/>
 
     </LinearLayout>
 
@@ -40,7 +53,9 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:id="@+id/audioSpinner"
-            android:layout_gravity="center_vertical"/>
+            android:layout_gravity="center_vertical"
+            android:popupBackground="@color/settings_popup_background"/>
 
     </LinearLayout>
+
 </LinearLayout>
diff --git a/mobile/src/main/res/layout/now_playing_movie.xml b/mobile/src/main/res/layout/now_playing_movie.xml
@@ -71,7 +71,6 @@
                 android:layout_height="wrap_content"
                 android:id="@+id/nowPlayingPoster"
                 android:adjustViewBounds="true"
-                android:src="@drawable/inception"
                 android:scaleType="fitXY"
                 android:layout_gravity="center_horizontal"/>
         </FrameLayout>
diff --git a/mobile/src/main/res/layout/now_playing_music.xml b/mobile/src/main/res/layout/now_playing_music.xml
@@ -75,7 +75,6 @@
                 android:layout_height="fill_parent"
                 android:id="@+id/nowPlayingPoster"
                 android:adjustViewBounds="true"
-                android:src="@drawable/bonobothumb2"
                 android:layout_gravity="center_horizontal"
                 android:scaleType="fitCenter"/>
         </FrameLayout>
diff --git a/mobile/src/main/res/layout/now_playing_show.xml b/mobile/src/main/res/layout/now_playing_show.xml
@@ -83,7 +83,6 @@
                     android:layout_height="wrap_content"
                     android:id="@+id/nowPlayingPoster"
                     android:adjustViewBounds="true"
-                    android:src="@drawable/inception"
                     android:scaleType="fitXY"
                     android:layout_gravity="center_horizontal"/>
             </FrameLayout>
diff --git a/mobile/src/main/res/values-de/patterns.xml b/mobile/src/main/res/values-de/patterns.xml
@@ -12,9 +12,9 @@ Wenn du eine Übersetzung hinzufügst bitte modifiziere nicht die Muster (.*), $
     <item name="pattern_recognition" type="string">^(((schaue|spiele|weiterschauen|höre|schaue film|spiele film) (.+)( auf (.+))?( mit zufallswiedergabe)?)|((springe) (.+)( auf (.+))?)|((forward|rewind|back) (.+)( on (.+))?)|(( wiedergabe)?(pausieren|anhalten|fortsetzen)( auf (.+))?))|(verbinde mit (.+)|trenne)|(cycle (subtitles|audio))|(.*subtitle.*(off|on))$</item>
 
     <item name="pattern_on_client" type="string">(.+) auf (.+)$</item>
-    <item name="pattern_resume_watching" type="string">^schaue|weiterschauen (.+)</item>
+    <item name="pattern_resume_watching" type="string">^(schaue|weiterschauen) (.+)</item>
     <item name="pattern_on_shuffle" type="string"> mit zufallswiedergabe$</item>
-    <item name="pattern_watch" type="string">schaue $1</item>
+    <item name="pattern_watch" type="string">schaue $2</item>
     <item name="pattern_watch_movie" type="string">(schaue|spiele) film (.+)</item>
     <item name="pattern_watch_season_episode_of_show" type="string">(schaue|spiele) staffel ([0-9]+) episode ([0-9]+) von (.+)</item>
     <item name="pattern_watch_show_season_episode" type="string">(schaue|spiele) (.+) staffel ([0-9]+) episode ([0-9]+)</item>
diff --git a/mobile/src/main/res/values-es/patterns.xml b/mobile/src/main/res/values-es/patterns.xml
@@ -12,9 +12,9 @@ adding translations, please do not modify (.*), $1, ([0-9]+), etc.
     <item name="pattern_recognition" type="string">^(((ver|continuar viendo|escuchar|ver película) (.+)( en (.+))?( en modo aleatorio)?)|((posición) (.+)( en (.+))?)|((forward|rewind|back) (.+)( on (.+))?)|((pausar|detener|continuar)( reproducción)?( en (.+))?))|(conectar a (.+)|desconectar)|(cycle (subtitles|audio))|(.*subtitle.*(off|on))$</item>
 
     <item name="pattern_on_client" type="string">(.+) en (.+)$</item>
-    <item name="pattern_resume_watching" type="string">^ver|(continuar viendo) (.+)</item>
+    <item name="pattern_resume_watching" type="string">^(ver|(continuar viendo)) (.+)</item>
     <item name="pattern_on_shuffle" type="string"> en modo aleatorio$</item>
-    <item name="pattern_watch" type="string">ver $2</item>
+    <item name="pattern_watch" type="string">ver $3</item>
     <item name="pattern_watch_movie" type="string">(ver) película (.+)</item>
     <item name="pattern_watch_season_episode_of_show" type="string">(ver) temporada ([0-9]+) episodio ([0-9]+) de (.+)</item>
     <item name="pattern_watch_show_season_episode" type="string">(ver) (.+) temporada ([0-9]+) episodio ([0-9]+)</item>
diff --git a/mobile/src/main/res/values-fr/patterns.xml b/mobile/src/main/res/values-fr/patterns.xml
@@ -14,9 +14,9 @@ Also, you don't need to translate these comments.
     <item name="pattern_recognition" type="string">^(((regarder|reprendre lecture|écouter|regarder film) (.+)( sur (.+))?)|((position) (.+)( sur (.+))?)|((forward|rewind|back) (.+)( on (.+))?)|((pauser|reprendre|arrêter)( lecture)?( sur (.+))?))|(cycle (subtitles|audio))|(.*subtitle.*(off|on))$</item>
 
     <item name="pattern_on_client" type="string">(.+) sur (.+)$</item>
-    <item name="pattern_resume_watching" type="string">^regarder|(reprendre lecture) (.+)</item>
+    <item name="pattern_resume_watching" type="string">^(regarder|(reprendre lecture)) (.+)</item>
     <item name="pattern_on_shuffle" type="string"> on shuffle$</item>
-    <item name="pattern_watch" type="string">regarder $2</item>
+    <item name="pattern_watch" type="string">regarder $3</item>
     <item name="pattern_watch_movie" type="string">(regarder) film (.+)</item>
     <item name="pattern_watch_season_episode_of_show" type="string">(regarder) saison ([0-9]+) épisode ([0-9]+) of (.+)</item>
     <item name="pattern_watch_show_season_episode" type="string">(regarder) (.+) saison ([0-9]+) épisode ([0-9]+)</item>
diff --git a/mobile/src/main/res/values-sv/patterns.xml b/mobile/src/main/res/values-sv/patterns.xml
@@ -13,9 +13,9 @@ Den här filen innehåller reguljära uttryck som används för att räkna ut vi
     <item name="pattern_recognition" type="string">^(((titta|spela|fortsätt titta|fortsätt spela|lyssna|titta på filmen|spela filmen) (.+)( på (.+))?( med blandad uppspelning)?)|((spola fram) (.+)( på (.+))?)|((forward|rewind|back) (.+)( on (.+))?)|((pausa|stoppa|återuppta|fortsätt)( uppspelingen)?( på (.+))?))|(anslut till (.+)|koppla från)|(cycle (subtitles|audio))|(.*subtitle.*(off|on))$</item>
 
     <item name="pattern_on_client" type="string">(.+) på (.+)$</item>
-    <item name="pattern_resume_watching" type="string">^fortsätt titta|spela (.+)</item>
+    <item name="pattern_resume_watching" type="string">^(fortsätt titta|spela) (.+)</item>
     <item name="pattern_on_shuffle" type="string"> med blandad uppspelning$</item>
-    <item name="pattern_watch" type="string">titta $1</item>
+    <item name="pattern_watch" type="string">titta $2</item>
     <item name="pattern_watch_movie" type="string">(titta på|spela) filmen (.+)</item>
     <item name="pattern_watch_season_episode_of_show" type="string">(titta på|spela) säsong ([0-9]+) avsnitt ([0-9]+) av (.+)</item>
     <item name="pattern_watch_show_season_episode" type="string">(titta på|spela) (.+) säsong ([0-9]+) avsnitt ([0-9]+)</item>
diff --git a/mobile/src/main/res/values/patterns.xml b/mobile/src/main/res/values/patterns.xml
@@ -14,9 +14,9 @@ Also, you don't need to translate these comments.
     <item name="pattern_recognition" type="string">^(((watch|play|resume watching|resume playing|listen to|watch movie|play movie) (.+)( on (.+))?( on shuffle)?)|((offset|timecode) (.+)( on (.+))?)|((forward|rewind|back) (.+)( on (.+))?)|((pause|stop|resume)( playback)?( on (.+))?))|(connect to (.+)|disconnect)|(cycle (subtitles|audio))|(.*subtitle.*(off|on))$</item>
 
     <item name="pattern_on_client" type="string">(.+) on (.+)$</item>
-    <item name="pattern_resume_watching" type="string">^resume watching|playing (.+)</item>
+    <item name="pattern_resume_watching" type="string">^resume (watching|playing) (.+)</item>
     <item name="pattern_on_shuffle" type="string"> on shuffle$</item>
-    <item name="pattern_watch" type="string">watch $1</item>
+    <item name="pattern_watch" type="string">watch $2</item>
     <item name="pattern_watch_movie" type="string">(watch|play) movie (.+)</item>
     <item name="pattern_watch_season_episode_of_show" type="string">(watch|play) season ([0-9]+) episode ([0-9]+) of (.+)</item>
     <item name="pattern_watch_show_season_episode" type="string">(watch|play) (.+) season ([0-9]+) episode ([0-9]+)</item>

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public Stream getActiveStream(int streamType) {`
`214`	`214`	`return stream;`
`215`	`215`	`}`
`216`	`216`
`217`		`- return streams.get(0);`
	`217`	`+ return null;`
`218`	`218`	`}`
`219`	`219`
`220`	`220`	`public void setActiveStream(Stream s) {`