Merge remote-tracking branch 'origin/master'

davidohayon669 · Apr 28, 2018 · 1c2d9dc · 1c2d9dc
2 parents 4001e80 + abe3b6a
commit 1c2d9dc
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/android/src/main/java/com/inprogress/reactnativeyoutube/VideoFragment.java b/android/src/main/java/com/inprogress/reactnativeyoutube/VideoFragment.java
@@ -7,17 +7,25 @@ public class VideoFragment extends YouTubePlayerFragment {
 
     private YouTubeView mYouTubeView;
 
-    public VideoFragment(YouTubeView youTubeView) {
+    public VideoFragment() {}
+
+
+    public void setYoutubeView(YouTubeView youTubeView) {
         mYouTubeView = youTubeView;
     }
 
     public static VideoFragment newInstance(YouTubeView youTubeView) {
-        return new VideoFragment(youTubeView);
+        VideoFragment fragment = new VideoFragment();
+        fragment.setYoutubeView(youTubeView);
+        return fragment;
     }
 
     @Override
     public void onResume() {
-        mYouTubeView.onVideoFragmentResume();
+        if (mYouTubeView != null) {
+            mYouTubeView.onVideoFragmentResume();
+        }
+
         super.onResume();
     }
 }