From f3719cef7e15c52c7506143f790bc0e51129cca4 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sat, 7 May 2022 19:17:37 +0200
Subject: [PATCH] Fix an issue for pull to refresh and home

---
 .../fedilab/android/ui/fragment/login/FragmentLoginMain.java  | 1 +
 .../ui/fragment/timeline/FragmentMastodonTimeline.java        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java b/app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java
index 849e6313..08a8f948 100644
--- a/app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java
+++ b/app/src/main/java/app/fedilab/android/ui/fragment/login/FragmentLoginMain.java
@@ -257,6 +257,7 @@ public class FragmentLoginMain extends Fragment {
                         Intent i = new Intent(requireActivity(), WebviewConnectActivity.class);
                         i.putExtra("login_url", redirectUrl);
                         startActivity(i);
+                        requireActivity().finish();
                     } else {
                         Intent intent = new Intent(Intent.ACTION_VIEW);
                         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
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 a4ffab38..4cb912a7 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
@@ -429,7 +429,7 @@ public class FragmentMastodonTimeline extends Fragment {
 
         new Thread(() -> {
             QuickLoad quickLoad = new QuickLoad(requireActivity()).getSavedValue(timelineType, ident);
-            if (direction == null && quickLoad != null && quickLoad.statuses != null && quickLoad.statuses.size() > 0) {
+            if (!binding.swipeContainer.isRefreshing() && direction == null && quickLoad != null && quickLoad.statuses != null && quickLoad.statuses.size() > 0) {
                 Statuses statuses = new Statuses();
                 statuses.statuses = quickLoad.statuses;
                 statuses.pagination = new Pagination();
@@ -590,7 +590,7 @@ public class FragmentMastodonTimeline extends Fragment {
                     fetchMarker = true;
                 }
                 //We search for marker only once - It should not be fetched again when pull to refresh
-                if (fetchMarker) {
+                if (fetchMarker && !binding.swipeContainer.isRefreshing()) {
                     //Search for last position
                     timelinesVM.getMarker(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, markers).observe(getViewLifecycleOwner(), marker -> {
                         if (marker != null) {