From c37bad0f7aa1c163124b2b353093336a0c624df1 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 27 Jan 2023 15:47:36 -0400
Subject: [PATCH] Fix opening filter when swiping from within
 collapsingtoolbar.

---
 .../conversationlist/ConversationFilterBehavior.kt       | 9 +++++++++
 1 file changed, 9 insertions(+)

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 5d1ce87eda..5aa5ed45e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationFilterBehavior.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.conversationlist
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.MotionEvent
 import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.coordinatorlayout.widget.CoordinatorLayout.Behavior
@@ -27,6 +28,14 @@ class ConversationFilterBehavior(context: Context, attributeSet: AttributeSet) :
     callback?.onStopNestedScroll()
   }
 
+  override fun onTouchEvent(parent: CoordinatorLayout, child: AppBarLayout, ev: MotionEvent): Boolean {
+    if (ev.action == MotionEvent.ACTION_UP) {
+      child.setExpanded(false, true)
+      callback?.onStopNestedScroll()
+    }
+    return super.onTouchEvent(parent, child, ev)
+  }
+
   interface Callback {
     fun onStopNestedScroll()
     fun canStartNestedScroll(): Boolean