From b7da5f7a2982186ac323fbf112ebb3d4040fa0b3 Mon Sep 17 00:00:00 2001
From: Conny Duck <k.pozniak@gmx.at>
Date: Sun, 8 Jul 2018 19:21:19 +0200
Subject: [PATCH] fix another crash in ViewThreadFragment

---
 .../keylesspalace/tusky/fragment/ViewThreadFragment.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
index 8cc4e7f60..70209e9e6 100644
--- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
+++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
@@ -119,6 +119,8 @@ public final class ViewThreadFragment extends SFragment implements
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        thisThreadsStatusId = getArguments().getString("id");
+
         adapter = new ThreadAdapter(this);
     }
 
@@ -179,7 +181,6 @@ public final class ViewThreadFragment extends SFragment implements
         recyclerView.setAdapter(adapter);
 
         statuses.clear();
-        thisThreadsStatusId = null;
 
         ((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false);
 
@@ -190,7 +191,6 @@ public final class ViewThreadFragment extends SFragment implements
     @Override
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        thisThreadsStatusId = getArguments().getString("id");
         onRefresh();
     }
 
@@ -598,7 +598,7 @@ public final class ViewThreadFragment extends SFragment implements
         Status eventStatus = event.getStatus();
         if (eventStatus.getInReplyToId() == null) return;
 
-        if (eventStatus.getInReplyToId().equals(statuses.get(statusIndex).getId())) {
+        if (eventStatus.getInReplyToId().equals(thisThreadsStatusId)) {
             insertStatus(eventStatus, statuses.size());
         } else {
             // If new status is a reply to some status in the thread, insert new status after it