Merge branch 'develop' into picture-in-picture

1 files changed, 11 insertions, 7 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
index 90b4c72ea..be5107d75 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java
@@ -7,6 +7,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.view.WindowCompat;
+import android.support.v7.app.ActionBar;
 import android.util.Log;
 import android.util.Pair;
 import android.view.Menu;
@@ -47,7 +48,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
     private VideoControlsHider videoControlsHider = new VideoControlsHider(this);
 
-    private AtomicBoolean isSetup = new AtomicBoolean(false);
+    private final AtomicBoolean isSetup = new AtomicBoolean(false);
 
     private LinearLayout controls;
     private LinearLayout videoOverlay;
@@ -182,7 +183,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
         progressIndicator.setVisibility(View.INVISIBLE);
     }
 
-    private View.OnTouchListener onVideoviewTouched = (v, event) -> {
+    private final View.OnTouchListener onVideoviewTouched = (v, event) -> {
         if (event.getAction() == MotionEvent.ACTION_DOWN) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
                     && isInPictureInPictureMode()) {
@@ -200,7 +201,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
     };
 
     @SuppressLint("NewApi")
-    void setupVideoControlsToggler() {
+    private void setupVideoControlsToggler() {
         videoControlsHider.stop();
         videoControlsHider.start();
     }
@@ -400,18 +401,21 @@ public class VideoplayerActivity extends MediaplayerActivity {
 
         private WeakReference<VideoplayerActivity> activity;
 
-        public VideoControlsHider(VideoplayerActivity activity) {
+        VideoControlsHider(VideoplayerActivity activity) {
             this.activity = new WeakReference<>(activity);
         }
 
         private final Runnable hideVideoControls = () -> {
-            VideoplayerActivity vpa = activity.get();
+            VideoplayerActivity vpa = activity != null ? activity.get() : null;
             if (vpa == null) {
                 return;
             }
             if (vpa.videoControlsShowing) {
                 Log.d(TAG, "Hiding video controls");
-                vpa.getSupportActionBar().hide();
+                ActionBar actionBar = vpa.getSupportActionBar();
+                if (actionBar != null) {
+                    actionBar.hide();
+                }
                 vpa.hideVideoControls();
                 vpa.videoControlsShowing = false;
             }
@@ -421,7 +425,7 @@ public class VideoplayerActivity extends MediaplayerActivity {
             this.postDelayed(hideVideoControls, DELAY);
         }
 
-        public void stop() {
+        void stop() {
             this.removeCallbacks(hideVideoControls);
         }