Merge pull request #109 from recruit-lifestyle/develop

Ver 2.4.2
recruit-lifestyle · Jan 25, 2019 · 353e19f · 353e19f
2 parents d0034e3 + 5c967b3
commit 353e19f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 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;
             }

diff --git a/...le/src/main/java/jp/co/recruit_lifestyle/sample/fragment/FloatingViewControlFragment.java b/...le/src/main/java/jp/co/recruit_lifestyle/sample/fragment/FloatingViewControlFragment.java
@@ -132,7 +132,7 @@ private void showFloatingView(Context context, boolean isShowOverlayPermission,
         // オーバレイパーミッションの表示
         if (isShowOverlayPermission) {
             final Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + context.getPackageName()));
-            startActivityForResult(intent, CHATHEAD_OVERLAY_PERMISSION_REQUEST_CODE);
+            startActivityForResult(intent, isCustomFloatingView ? CUSTOM_OVERLAY_PERMISSION_REQUEST_CODE : CHATHEAD_OVERLAY_PERMISSION_REQUEST_CODE);
         }
     }