merge

sk22 · Nov 27, 2023 · 1071517 · 1071517
1 parent 26e9534
commit 1071517
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...odon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java b/...odon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
@@ -10,17 +10,21 @@
 import java.util.List;
 
 public class GetPublicTimeline extends MastodonAPIRequest<List<Status>>{
-	public GetPublicTimeline(boolean local, boolean remote, String maxID, int limit, String replyVisibility){
+	public GetPublicTimeline(boolean local, boolean remote, String maxID, String minID, int limit, String sinceID, String replyVisibility){
 		super(HttpMethod.GET, "/timelines/public", new TypeToken<>(){});
 		if(local)
 			addQueryParameter("local", "true");
 		if(remote)
 			addQueryParameter("remote", "true");
 		if(!TextUtils.isEmpty(maxID))
 			addQueryParameter("max_id", maxID);
+		if(!TextUtils.isEmpty(minID))
+			addQueryParameter("min_id", minID);
+		if(!TextUtils.isEmpty(sinceID))
+			addQueryParameter("since_id", sinceID);
 		if(limit>0)
 			addQueryParameter("limit", limit+"");
-		if(replyVisibility != null)
+		if(!TextUtils.isEmpty(replyVisibility))
 			addQueryParameter("reply_visibility", replyVisibility);
 	}
 }
diff --git a/.../src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java b/.../src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
@@ -29,7 +29,7 @@ public void onCreate(Bundle savedInstanceState){
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(false, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(false, false, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){

diff --git a/...odon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java b/...odon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
@@ -29,7 +29,7 @@ public void onCreate(Bundle savedInstanceState){
 
 	@Override
 	protected void doLoadData(int offset, int count){
-		currentRequest=new GetPublicTimeline(true, false, getMaxID(), count, getLocalPrefs().timelineReplyVisibility)
+		currentRequest=new GetPublicTimeline(true, false, getMaxID(), null, count, null, getLocalPrefs().timelineReplyVisibility)
 				.setCallback(new SimpleCallback<>(this){
 					@Override
 					public void onSuccess(List<Status> result){