TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 11:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with swipe-to-reply triggering incorrectly.

Browse Source 
Fixes #9227
This commit is contained in:
Greyson Parrelli 2020-01-05 21:58:48 -05:00 committed by Alan Evans
parent 284fe294ac
commit 94604921f9
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/org/thoughtcrime/securesms/conversation/ConversationItemSwipeCallback.java
View File

@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.conversation; package org.thoughtcrime.securesms.conversation;
import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.os.Vibrator; import android.os.Vibrator;
@ -20,7 +21,8 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
private static long SWIPE_SUCCESS_VIBE_TIME_MS = 10; private static long SWIPE_SUCCESS_VIBE_TIME_MS = 10;
private boolean swipeBack; private boolean swipeBack;
private boolean shouldTriggerSwipeFeedback = true; private boolean shouldTriggerSwipeFeedback;
private boolean canTriggerSwipe;
private float latestDownX; private float latestDownX;
private float latestDownY; private float latestDownY;
@ -32,9 +34,11 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
@NonNull OnSwipeListener onSwipeListener) @NonNull OnSwipeListener onSwipeListener)
{ {
super(0, ItemTouchHelper.END); super(0, ItemTouchHelper.END);
this.itemTouchListener = new ConversationItemTouchListener(this::updateLatestDownCoordinate); this.itemTouchListener = new ConversationItemTouchListener(this::updateLatestDownCoordinate);
this.swipeAvailabilityProvider = swipeAvailabilityProvider; this.swipeAvailabilityProvider = swipeAvailabilityProvider;
this.onSwipeListener = onSwipeListener; this.onSwipeListener = onSwipeListener;
this.shouldTriggerSwipeFeedback = true;
this.canTriggerSwipe = true;
} }
void attachToRecyclerView(@NonNull RecyclerView recyclerView) { void attachToRecyclerView(@NonNull RecyclerView recyclerView) {
@ -86,12 +90,17 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE && isCorrectSwipeDir) { if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE && isCorrectSwipeDir) {
ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView, Math.abs(dx), sign); ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView, Math.abs(dx), sign);
handleSwipeFeedback((ConversationItem) viewHolder.itemView, Math.abs(dx)); handleSwipeFeedback((ConversationItem) viewHolder.itemView, Math.abs(dx));
setTouchListener(recyclerView, viewHolder, Math.abs(dx)); if (canTriggerSwipe) {
setTouchListener(recyclerView, viewHolder, Math.abs(dx));
}
} else if (actionState == ItemTouchHelper.ACTION_STATE_IDLE || dx == 0) { } else if (actionState == ItemTouchHelper.ACTION_STATE_IDLE || dx == 0) {
ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView, 0, 1); ConversationSwipeAnimationHelper.update((ConversationItem) viewHolder.itemView, 0, 1);
} }
if (dx == 0) shouldTriggerSwipeFeedback = true; if (dx == 0) {
shouldTriggerSwipeFeedback = true;
canTriggerSwipe = true;
}
} }
private void handleSwipeFeedback(@NonNull ConversationItem item, float dx) { private void handleSwipeFeedback(@NonNull ConversationItem item, float dx) {
@ -111,6 +120,7 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
onSwipeListener.onSwipe(messageRecord); onSwipeListener.onSwipe(messageRecord);
} }
@SuppressLint("ClickableViewAccessibility")
private void setTouchListener(@NonNull RecyclerView recyclerView, private void setTouchListener(@NonNull RecyclerView recyclerView,
@NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder viewHolder,
float dx) float dx)
@ -137,6 +147,7 @@ class ConversationItemSwipeCallback extends ItemTouchHelper.SimpleCallback {
float dx) float dx)
{ {
if (dx > SWIPE_SUCCESS_DX) { if (dx > SWIPE_SUCCESS_DX) {
canTriggerSwipe = false;
onSwiped(viewHolder); onSwiped(viewHolder);
if (shouldTriggerSwipeFeedback) { if (shouldTriggerSwipeFeedback) {
vibrate(viewHolder.itemView.getContext()); vibrate(viewHolder.itemView.getContext());