From 7139f919977c23b75c3fb26c0810e755fd6a7dd8 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Wed, 12 Oct 2022 10:39:20 -0400
Subject: [PATCH] Fix unread count separator and mark read when viewing
 behavior.

Fixes #12510
---
 .../securesms/conversation/ConversationFragment.java            | 2 +-
 .../org/thoughtcrime/securesms/conversation/LastSeenHeader.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 7c6e34f92d..99cc31f24d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -1380,7 +1380,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
     }
 
     int position = getListLayoutManager().findFirstVisibleItemPosition();
-    if (position == getListAdapter().getItemCount() - 1) {
+    if (position == -1 || position == getListAdapter().getItemCount() - 1) {
       return;
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/LastSeenHeader.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/LastSeenHeader.java
index c10e0799a0..49c796f797 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/LastSeenHeader.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/LastSeenHeader.java
@@ -30,7 +30,7 @@ class LastSeenHeader extends StickyHeaderDecoration {
 
   @Override
   protected boolean hasHeader(RecyclerView parent, StickyHeaderAdapter stickyAdapter, int position) {
-    if (lastSeenTimestamp <= 0) {
+    if (lastSeenTimestamp <= 0 || unreadCount <= 0) {
       return false;
     }