From cf7455c661fb3164bf754eaded1d7e4f7fa791ef Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 12 Sep 2023 10:58:39 -0300
Subject: [PATCH] Do not display clear filter when no filter is applied in call
 log.

---
 .../thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt  | 2 +-
 .../securesms/conversation/v2/items/V2FooterPositionDelegate.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
index e6356fdf60..26b3657a70 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/calls/log/CallLogPagedDataSource.kt
@@ -63,7 +63,7 @@ class CallLogPagedDataSource(
       remaining -= callEvents.size
     }
 
-    if (start <= clearFilterStart && remaining > 0) {
+    if (hasFilter && start <= clearFilterStart && remaining > 0) {
       callLogRows.add(CallLogRow.ClearFilter)
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate.kt
index 7ddce5a8c7..6f88ef6053 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2FooterPositionDelegate.kt
@@ -108,7 +108,7 @@ class V2FooterPositionDelegate private constructor(
     val (left, right) = if (bodyContainer.layoutDirection == View.LAYOUT_DIRECTION_LTR) {
       0 to horizontalPadding
     } else {
-       horizontalPadding to 0
+      horizontalPadding to 0
     }
 
     body.padding(right = right, left = left, bottom = footerViews.first().measuredHeight)