From 6aa4706e9b23c8bd1a1b3f19ef87a4fe15a84b9b Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 5 Jul 2022 10:54:35 -0300
Subject: [PATCH] Fix bad behaviour for long group replies.

---
 .../util/adapter/mapping/PagingMappingAdapter.java |  2 +-
 .../res/layout/stories_group_text_reply_item.xml   | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter.java
index 688887bb9..8c006968c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/adapter/mapping/PagingMappingAdapter.java
@@ -38,7 +38,7 @@ public class PagingMappingAdapter<Key> extends MappingAdapter {
       pagingController.onDataNeededAroundIndex(position);
     }
 
-    if (position > 0 && position < super.getCurrentList().size()) {
+    if (position >= 0 && position < super.getCurrentList().size()) {
       return super.getItem(position);
     } else {
       return null;
diff --git a/app/src/main/res/layout/stories_group_text_reply_item.xml b/app/src/main/res/layout/stories_group_text_reply_item.xml
index 0f2bcf860..ed1421329 100644
--- a/app/src/main/res/layout/stories_group_text_reply_item.xml
+++ b/app/src/main/res/layout/stories_group_text_reply_item.xml
@@ -41,7 +41,7 @@
         android:layout_height="1dp"
         app:barrierDirection="start"
         app:barrierMargin="-8dp"
-        app:constraint_referenced_ids="alert_view" />
+        app:constraint_referenced_ids="alert_view,spacer" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/viewed_at_end_barrier"
@@ -159,7 +159,17 @@
         app:layout_constraintEnd_toStartOf="@+id/reaction"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@+id/bubble_end_barrier"
-        tools:visibility="visible" />
+        tools:visibility="gone" />
+
+    <Space
+        android:id="@+id/spacer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_goneMarginEnd="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/reaction"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintStart_toEndOf="@+id/bubble_end_barrier" />
 
     <org.thoughtcrime.securesms.components.emoji.EmojiImageView
         android:id="@+id/reaction"