From 5abe3e63f9b3d62449093d3446ff0d1b4f82ba83 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 30 May 2022 15:22:11 +0200
Subject: [PATCH] Fix next messages not loading

---
 .../android/ui/fragment/timeline/FragmentMastodonAccount.java  | 3 ++-
 .../ui/fragment/timeline/FragmentMastodonConversation.java     | 2 +-
 .../ui/fragment/timeline/FragmentMastodonNotification.java     | 3 ++-
 .../android/ui/fragment/timeline/FragmentMastodonTimeline.java | 2 ++
 .../ui/fragment/timeline/FragmentNotificationContainer.java    | 2 --
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java
index 369c73fb6..fd73c8359 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java
@@ -171,6 +171,7 @@ public class FragmentMastodonAccount extends Fragment {
      * @param accounts {@link Accounts}
      */
     private void initializeAccountCommonView(final Accounts accounts) {
+        flagLoading = false;
         if (binding == null) {
             return;
         }
@@ -240,7 +241,7 @@ public class FragmentMastodonAccount extends Fragment {
      * @param fetched_accounts Accounts
      */
     private void dealWithPagination(Accounts fetched_accounts) {
-
+        flagLoading = false;
         if (binding == null) {
             return;
         }
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java
index b7613ccd8..862090a6b 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonConversation.java
@@ -84,7 +84,7 @@ public class FragmentMastodonConversation extends Fragment {
      * @param conversations {@link Conversations}
      */
     private void initializeConversationCommonView(final Conversations conversations) {
-
+        flagLoading = false;
         binding.loader.setVisibility(View.GONE);
         binding.noAction.setVisibility(View.GONE);
         if (conversationAdapter != null && this.conversations != null) {
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
index 55bc6dda0..1fc6b6f2c 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonNotification.java
@@ -182,7 +182,7 @@ public class FragmentMastodonNotification extends Fragment {
 
         binding.loader.setVisibility(View.GONE);
         binding.swipeContainer.setRefreshing(false);
-
+        flagLoading = false;
         if (notifications == null || notifications.notifications == null) {
             binding.noActionText.setText(R.string.no_notifications);
             binding.noAction.setVisibility(View.VISIBLE);
@@ -278,6 +278,7 @@ public class FragmentMastodonNotification extends Fragment {
      */
     private void dealWithPagination(Notifications fetched_notifications) {
         binding.loadingNextElements.setVisibility(View.GONE);
+        flagLoading = false;
         if (currentFragment.notifications != null && fetched_notifications != null && fetched_notifications.notifications != null) {
             flagLoading = fetched_notifications.pagination.max_id == null;
             if (aggregateNotification) {
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
index fe44a914e..d563c57fc 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java
@@ -250,6 +250,7 @@ public class FragmentMastodonTimeline extends Fragment {
      * @param statuses {@link Statuses}
      */
     private void initializeStatusesCommonView(final Statuses statuses) {
+        flagLoading = false;
         if (binding == null) {
             return;
         }
@@ -366,6 +367,7 @@ public class FragmentMastodonTimeline extends Fragment {
             return;
         }
         binding.loadingNextElements.setVisibility(View.GONE);
+        flagLoading = false;
         if (statuses != null && fetched_statuses != null && fetched_statuses.statuses != null && fetched_statuses.statuses.size() > 0) {
 
             flagLoading = fetched_statuses.pagination.max_id == null;
diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentNotificationContainer.java b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentNotificationContainer.java
index 6ef14d3c5..65aeb3b41 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentNotificationContainer.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentNotificationContainer.java
@@ -247,10 +247,8 @@ public class FragmentNotificationContainer extends Fragment {
 
             }
         });
-
     }
 
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();