From 1764e5f3d1176c6e7eff55a08a37d38e3e5c1946 Mon Sep 17 00:00:00 2001 From: Grishka Date: Sun, 15 Jan 2023 11:09:53 +0300 Subject: [PATCH] Paginate trending posts --- .../android/api/requests/trends/GetTrendingStatuses.java | 4 +++- .../android/fragments/discover/DiscoverPostsFragment.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java b/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java index b902563c..ea781d71 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java +++ b/mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java @@ -8,9 +8,11 @@ import org.joinmastodon.android.model.Status; import java.util.List; public class GetTrendingStatuses extends MastodonAPIRequest>{ - public GetTrendingStatuses(int limit){ + public GetTrendingStatuses(int offset, int limit){ super(HttpMethod.GET, "/trends/statuses", new TypeToken<>(){}); if(limit>0) addQueryParameter("limit", ""+limit); + if(offset>0) + addQueryParameter("offset", ""+offset); } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java index c79b5120..ebf8b762 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java @@ -17,11 +17,11 @@ public class DiscoverPostsFragment extends StatusListFragment{ @Override protected void doLoadData(int offset, int count){ - currentRequest=new GetTrendingStatuses(count) + currentRequest=new GetTrendingStatuses(offset, count) .setCallback(new SimpleCallback<>(this){ @Override public void onSuccess(List result){ - onDataLoaded(result, false); + onDataLoaded(result, !result.isEmpty()); } }).exec(accountID); }