From a7d6c0f25c09d3f84ccaca237905659ca283b790 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Tue, 25 Apr 2023 11:46:22 -0300 Subject: [PATCH] Prevent filtering when in multiselect mode. --- .../org/thoughtcrime/securesms/calls/log/CallLogFragment.kt | 2 +- .../securesms/conversationlist/ConversationFilterBehavior.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt index 968fce50df..ffed22b2c0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogFragment.kt @@ -268,7 +268,7 @@ class CallLogFragment : Fragment(R.layout.call_log_fragment), CallLogAdapter.Cal } override fun canStartNestedScroll(): Boolean { - return !callLogActionMode.isInActionMode() || !isSearchOpen() || binding.pullView.isCloseable() + return !callLogActionMode.isInActionMode() && !isSearchOpen() } } diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt index 5aa5ed45e3..4c85386fae 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt @@ -5,7 +5,6 @@ import android.util.AttributeSet import android.view.MotionEvent import android.view.View import androidx.coordinatorlayout.widget.CoordinatorLayout -import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior import androidx.core.view.ViewCompat import com.google.android.material.appbar.AppBarLayout import org.thoughtcrime.securesms.util.FeatureFlags