Merge pull request #108 from recruit-lifestyle/feature/fix_null_velocity

Fixed bug where mVelocityTracker caused NullPointerException
recruit-lifestyle · Jan 22, 2019 · 5c967b3 · 5c967b3
2 parents 5afad50 + b4a83da
commit 5c967b3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingView.java b/library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingView.java
@@ -878,8 +878,8 @@ else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL)
             // 拡大率をもとに戻す
             setScale(SCALE_NORMAL);
 
-            // destroy VelocityTracker
-            if (!mIsMoveAccept) {
+            // destroy VelocityTracker (#103)
+            if (!mIsMoveAccept && mVelocityTracker != null) {
                 mVelocityTracker.recycle();
                 mVelocityTracker = null;
             }