[Android] Prevent NPE with GestureDetector

[Geoffrey Métais]

vlc-ports/android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Nov 13 11:43:19 2015 +0100| [ef710bd9e5f765144cb967c061ec9d5c58460c61] | committer: Geoffrey Métais

Prevent NPE with GestureDetector

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=ef710bd9e5f765144cb967c061ec9d5c58460c61
---

 .../org/videolan/vlc/gui/video/VideoPlayerActivity.java |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 560d9b9..c75e2b5 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -166,7 +166,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
     private int mPresentationDisplayId = -1;
     private Uri mUri;
     private boolean mAskResume = true;
-    private GestureDetectorCompat mDetector;
+    private GestureDetectorCompat mDetector = null;
 
     private static final int SURFACE_BEST_FIT = 0;
     private static final int SURFACE_FIT_HORIZONTAL = 1;
@@ -465,7 +465,6 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
             setRequestedOrientation(getScreenOrientation());
 
         resetHudLayout();
-        mDetector = new GestureDetectorCompat(this, mGestureListener);
     }
 
     public boolean onCreateOptionsMenu(Menu menu){
@@ -788,7 +787,10 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
 
         mHandler.removeCallbacksAndMessages(null);
 
-        mDetector.setOnDoubleTapListener(null);
+        if (mDetector != null) {
+            mDetector.setOnDoubleTapListener(null);
+            mDetector = null;
+        }
 
         /* Stop listening for changes to media routes. */
         if (mMediaRouter != null)
@@ -1742,7 +1744,7 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
             endDelaySetting();
             return true;
         }
-        if (mDetector.onTouchEvent(event))
+        if (mDetector != null && mDetector.onTouchEvent(event))
             return true;
         if (mIsLocked) {
             // locked, only handle show/hide & ignore all actions
@@ -2161,7 +2163,10 @@ public class VideoPlayerActivity extends AppCompatActivity implements IVLCVout.C
         mPlayPause.setEnabled(pausable);
         if (!pausable)
             mPlayPause.setImageResource(R.drawable.ic_play_circle_disable_o);
-        mDetector.setOnDoubleTapListener(pausable ? this : null);
+        else {
+            mDetector = new GestureDetectorCompat(this, mGestureListener);
+            mDetector.setOnDoubleTapListener(this);
+        }
     }
 
     private void doPlayPause() {