mirror of
https://codeberg.org/tom79/Fedilab.git
synced 2025-01-03 06:30:07 +02:00
Merge branch 'fixes_487' into develop
This commit is contained in:
commit
7930cdf838
2 changed files with 5 additions and 2 deletions
app/src/main/java/app/fedilab/android/mastodon
|
@ -280,13 +280,13 @@ public class SearchResultTabActivity extends BaseBarActivity {
|
|||
public void moveToAccount() {
|
||||
tagEmpty = null;
|
||||
accountEmpty = null;
|
||||
binding.searchViewpager.setCurrentItem(1);
|
||||
binding.searchViewpager.post(() -> binding.searchViewpager.setCurrentItem(1));
|
||||
}
|
||||
|
||||
public void moveToMessage() {
|
||||
tagEmpty = null;
|
||||
accountEmpty = null;
|
||||
binding.searchViewpager.setCurrentItem(2);
|
||||
binding.searchViewpager.post(() -> binding.searchViewpager.setCurrentItem(2));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -2837,6 +2837,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
|
|||
}
|
||||
int to = Math.min(position + siblings, max_size - 1);
|
||||
for (Status status : statusList.subList(from, to)) {
|
||||
if (status == null) {
|
||||
continue;
|
||||
}
|
||||
Status statusToDeal = status.reblog != null ? status.reblog : status;
|
||||
if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) {
|
||||
attachments.addAll(statusToDeal.media_attachments);
|
||||
|
|
Loading…
Reference in a new issue