Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
sk 2023-01-16 09:39:29 +01:00
parent 1cc6bf4971 ab3a98fd60
commit b4fa74b78f
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/api/requests/trends/GetTrendingStatuses.java
View File

@ -8,9 +8,11 @@ import org.joinmastodon.android.model.Status;
import java.util.List; import java.util.List;
public class GetTrendingStatuses extends MastodonAPIRequest<List<Status>>{ public class GetTrendingStatuses extends MastodonAPIRequest<List<Status>>{
public GetTrendingStatuses(int limit){ public GetTrendingStatuses(int offset, int limit){
super(HttpMethod.GET, "/trends/statuses", new TypeToken<>(){}); super(HttpMethod.GET, "/trends/statuses", new TypeToken<>(){});
if(limit>0) if(limit>0)
addQueryParameter("limit", ""+limit); addQueryParameter("limit", ""+limit);
if(offset>0)
addQueryParameter("offset", ""+offset);
} }
} }

5
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@ -705,7 +705,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
DraftMediaAttachment da=new DraftMediaAttachment(); DraftMediaAttachment da=new DraftMediaAttachment();
da.serverAttachment=att; da.serverAttachment=att;
da.description=att.description; da.description=att.description;
da.uri=Uri.parse(att.previewUrl); da.uri=att.previewUrl!=null ? Uri.parse(att.previewUrl) : null;
da.state=AttachmentUploadState.DONE; da.state=AttachmentUploadState.DONE;
attachmentsView.addView(createMediaAttachmentView(da)); attachmentsView.addView(createMediaAttachmentView(da));
attachments.add(da); attachments.add(da);
@ -1265,7 +1265,8 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
View thumb=getActivity().getLayoutInflater().inflate(R.layout.compose_media_thumb, attachmentsView, false); View thumb=getActivity().getLayoutInflater().inflate(R.layout.compose_media_thumb, attachmentsView, false);
ImageView img=thumb.findViewById(R.id.thumb); ImageView img=thumb.findViewById(R.id.thumb);
if(draft.serverAttachment!=null){ if(draft.serverAttachment!=null){
ViewImageLoader.load(img, draft.serverAttachment.blurhashPlaceholder, new UrlImageLoaderRequest(draft.serverAttachment.previewUrl, V.dp(250), V.dp(250))); if(draft.serverAttachment.previewUrl!=null)
ViewImageLoader.load(img, draft.serverAttachment.blurhashPlaceholder, new UrlImageLoaderRequest(draft.serverAttachment.previewUrl, V.dp(250), V.dp(250)));
}else{ }else{
if(draft.mimeType.startsWith("image/")){ if(draft.mimeType.startsWith("image/")){
ViewImageLoader.load(img, null, new UrlImageLoaderRequest(draft.uri, V.dp(250), V.dp(250))); ViewImageLoader.load(img, null, new UrlImageLoaderRequest(draft.uri, V.dp(250), V.dp(250)));

4
mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
View File

@ -17,11 +17,11 @@ public class DiscoverPostsFragment extends StatusListFragment{
@Override @Override
protected void doLoadData(int offset, int count){ protected void doLoadData(int offset, int count){
currentRequest=new GetTrendingStatuses(count) currentRequest=new GetTrendingStatuses(offset, count)
.setCallback(new SimpleCallback<>(this){ .setCallback(new SimpleCallback<>(this){
@Override @Override
public void onSuccess(List<Status> result){ public void onSuccess(List<Status> result){
onDataLoaded(result, false); onDataLoaded(result, !result.isEmpty());
} }
}).exec(accountID); }).exec(accountID);
} }