From ed75a6222845a84d09e4a0f0242b81b93fc5213f Mon Sep 17 00:00:00 2001 From: FineFindus Date: Sun, 16 Apr 2023 21:44:05 +0200 Subject: [PATCH] refactor(follower): move remote check to own method --- .../account_list/PaginatedAccountListFragment.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 67df4cef4..66566fc87 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 @@ -9,7 +9,6 @@ import org.joinmastodon.android.model.Account; import org.joinmastodon.android.model.HeaderPaginationList; import org.joinmastodon.android.ui.utils.UiUtils; -import java.util.Objects; import java.util.stream.Collectors; import me.grishka.appkit.api.Callback; @@ -27,8 +26,7 @@ public abstract class PaginatedAccountListFragment extends BaseAccountListFragme @Override protected void doLoadData(int offset, int count){ - if(GlobalUserPreferences.loadRemoteAccountFollowers && targetAccount.getDomain() != null){ - if ((this instanceof FollowingListFragment || this instanceof FollowerListFragment) && targetAccount != null){ + if (shouldLoadRemote()) { UiUtils.lookupRemoteAccount(getContext(), targetAccount, accountID, null, account -> { if(account != null){ loadRemoteFollower(offset, count, account); @@ -36,12 +34,18 @@ public abstract class PaginatedAccountListFragment extends BaseAccountListFragme loadFollower(offset, count); } }); - } } else { loadFollower(offset, count); } } + private boolean shouldLoadRemote() { + if (!GlobalUserPreferences.loadRemoteAccountFollowers && (this instanceof FollowingListFragment || this instanceof FollowerListFragment)) { + return false; + } + return targetAccount != null && targetAccount.getDomain() != null; + } + void loadFollower(int offset, int count) { currentRequest=onCreateRequest(offset==0 ? null : nextMaxID, count) .setCallback(new SimpleCallback<>(this){