From 4d0fac5241bbba5ad173ddb083ceb16eaa7f407e Mon Sep 17 00:00:00 2001 From: mcarare Date: Tue, 12 Jul 2022 09:37:01 +0300 Subject: [PATCH] [fenix] For https://github.com/mozilla-mobile/fenix/issues/25980: Update method signatures for SimpleOnGestureListener. GestureDetector onTouchEvent now expects only a NonNull MotionEvent. --- .../java/org/mozilla/fenix/browser/SwipeGestureLayout.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/browser/SwipeGestureLayout.kt b/app/src/main/java/org/mozilla/fenix/browser/SwipeGestureLayout.kt index a1084602e3..c34279ed16 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/SwipeGestureLayout.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/SwipeGestureLayout.kt @@ -106,8 +106,8 @@ class SwipeGestureLayout @JvmOverloads constructor( listeners.add(listener) } - override fun onInterceptTouchEvent(event: MotionEvent?): Boolean { - return when (event?.actionMasked) { + override fun onInterceptTouchEvent(event: MotionEvent): Boolean { + return when (event.actionMasked) { MotionEvent.ACTION_DOWN -> { handledInitialScroll = false gestureDetector.onTouchEvent(event) @@ -117,8 +117,8 @@ class SwipeGestureLayout @JvmOverloads constructor( } } - override fun onTouchEvent(event: MotionEvent?): Boolean { - return when (event?.actionMasked) { + override fun onTouchEvent(event: MotionEvent): Boolean { + return when (event.actionMasked) { MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> { gestureDetector.onTouchEvent(event) // If the active listener is not null here, then we haven't detected a fling