From 2fc4020b727e6d593936b6259daae04bd96caac4 Mon Sep 17 00:00:00 2001
From: Balazs Toldi <balazs@toldi.eu>
Date: Thu, 27 Jul 2023 17:45:14 +0200
Subject: [PATCH] Fix post refreshing bug

Fix bug where the whole post disappears after refreshing it.
---
 .../adapters/CommentsRecyclerViewAdapter.java     |  4 ++++
 .../fragments/ViewPostDetailFragment.java         | 15 ++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/CommentsRecyclerViewAdapter.java b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/CommentsRecyclerViewAdapter.java
index f99c587f..fda2b9f4 100644
--- a/app/src/main/java/eu/toldi/infinityforlemmy/adapters/CommentsRecyclerViewAdapter.java
+++ b/app/src/main/java/eu/toldi/infinityforlemmy/adapters/CommentsRecyclerViewAdapter.java
@@ -1937,4 +1937,8 @@ public class CommentsRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerVi
             ((TextView) itemView).setTextColor(mColorAccent);
         }
     }
+
+    public void clearLoadedComments() {
+        loadedComments.clear();
+    }
 }
diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ViewPostDetailFragment.java b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ViewPostDetailFragment.java
index 47731b25..263de60c 100644
--- a/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ViewPostDetailFragment.java
+++ b/app/src/main/java/eu/toldi/infinityforlemmy/fragments/ViewPostDetailFragment.java
@@ -1408,16 +1408,11 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
                         public void onFetchSubredditDataSuccess(SubredditData subredditData, int nCurrentOnlineSubscribers) {
                             String suggestedCommentSort = "top";
                             SortType.Type sortTypeType;
-                            if (suggestedCommentSort == null || suggestedCommentSort.equals("null") || suggestedCommentSort.equals("")) {
-                                mRespectSubredditRecommendedSortType = false;
+                            try {
+                                sortTypeType = SortType.Type.fromValue(suggestedCommentSort);
+                            } catch (IllegalArgumentException e) {
+                                e.printStackTrace();
                                 sortTypeType = loadSortType();
-                            } else {
-                                try {
-                                    sortTypeType = SortType.Type.valueOf(suggestedCommentSort.toUpperCase(Locale.US));
-                                } catch (IllegalArgumentException e) {
-                                    e.printStackTrace();
-                                    sortTypeType = loadSortType();
-                                }
                             }
                             activity.setTitle(sortTypeType.fullName);
                             ViewPostDetailFragment.this.sortType = sortTypeType;
@@ -1582,6 +1577,8 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
                                     mSwipeRefreshLayout.setRefreshing(false);
 
                                     if (fetchComments) {
+                                        pages_loaded = 0;
+                                        mCommentsAdapter.clearLoadedComments();
                                         fetchCommentsRespectRecommendedSort(true);
                                     } else {
                                         isRefreshing = false;