Skip to content

Commit d098c7b

Browse files
committed
[Fix] Add null check for intercepting listener.
1 parent 8a06dc9 commit d098c7b

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

library/src/main/java/me/zhanghai/android/fastscroll/FixOnItemTouchListenerRecyclerView.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ public boolean onInterceptTouchEvent(@NonNull RecyclerView recyclerView,
105105
continue;
106106
}
107107
if (intercepted) {
108-
mInterceptingListener = listener;
109108
mTrackingListeners.remove(listener);
110109
event.setAction(MotionEvent.ACTION_CANCEL);
111110
for (OnItemTouchListener trackingListener : mTrackingListeners) {
112111
trackingListener.onInterceptTouchEvent(recyclerView, event);
113112
}
114113
event.setAction(action);
115114
mTrackingListeners.clear();
115+
mInterceptingListener = listener;
116116
return true;
117117
} else {
118118
mTrackingListeners.add(listener);
@@ -123,6 +123,9 @@ public boolean onInterceptTouchEvent(@NonNull RecyclerView recyclerView,
123123

124124
@Override
125125
public void onTouchEvent(@NonNull RecyclerView recyclerView, @NonNull MotionEvent event) {
126+
if (mInterceptingListener == null) {
127+
return;
128+
}
126129
mInterceptingListener.onTouchEvent(recyclerView, event);
127130
int action = event.getAction();
128131
if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {

0 commit comments

Comments
 (0)