From 4da6016e06fcd2d0a146b0d94ba808b67dc9b3e6 Mon Sep 17 00:00:00 2001
From: FineFindus <FineFindus@proton.me>
Date: Sun, 16 Apr 2023 21:19:24 +0200
Subject: [PATCH] refactor(follower): move null check in called method

---
 .../android/fragments/account_list/BaseAccountListFragment.java | 2 ++
 .../fragments/account_list/PaginatedAccountListFragment.java    | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
index bf8dd4c5b..357540ab5 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
@@ -74,6 +74,8 @@ public abstract class BaseAccountListFragment extends RecyclerFragment<BaseAccou
 
 	@Override
 	protected void onDataLoaded(List<AccountItem> d, boolean more){
+		if (getActivity() == null)
+			return;
 		if(refreshing){
 			relationships.clear();
 		}
diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
index 49cc5c6a8..10b265190 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
@@ -47,7 +47,6 @@ public abstract class PaginatedAccountListFragment extends BaseAccountListFragme
 							nextMaxID=result.nextPageUri.getQueryParameter("max_id");
 						else
 							nextMaxID=null;
-						if (getActivity() == null) return;
 						onDataLoaded(result.stream().map(AccountItem::new).collect(Collectors.toList()), nextMaxID!=null);
 					}
 				})
@@ -69,7 +68,6 @@ public abstract class PaginatedAccountListFragment extends BaseAccountListFragme
 								remoteAccount.acct += "@" + Uri.parse(remoteAccount.url).getHost();
 							}
 						});
-						if (getActivity() == null) return;
 						onDataLoaded(result.stream().map(AccountItem::new).collect(Collectors.toList()), false);
 					}
 				})