mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-01-05 07:30:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fixes_487' into develop

Browse source
This commit is contained in:
Thomas 2023-03-21 13:03:03 +01:00
commit 7930cdf838
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java
View file

@ -280,13 +280,13 @@ public class SearchResultTabActivity extends BaseBarActivity {
public void moveToAccount() { public void moveToAccount() {
tagEmpty = null; tagEmpty = null;
accountEmpty = null; accountEmpty = null;
binding.searchViewpager.setCurrentItem(1); binding.searchViewpager.post(() -> binding.searchViewpager.setCurrentItem(1));
} }
public void moveToMessage() { public void moveToMessage() {
tagEmpty = null; tagEmpty = null;
accountEmpty = null; accountEmpty = null;
binding.searchViewpager.setCurrentItem(2); binding.searchViewpager.post(() -> binding.searchViewpager.setCurrentItem(2));
} }
/** /**

3
app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java
View file

@ -2837,6 +2837,9 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
} }
int to = Math.min(position + siblings, max_size - 1); int to = Math.min(position + siblings, max_size - 1);
for (Status status : statusList.subList(from, to)) { for (Status status : statusList.subList(from, to)) {
if (status == null) {
continue;
}
Status statusToDeal = status.reblog != null ? status.reblog : status; Status statusToDeal = status.reblog != null ? status.reblog : status;
if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) { if (statusToDeal.media_attachments != null && statusToDeal.media_attachments.size() > 0) {
attachments.addAll(statusToDeal.media_attachments); attachments.addAll(statusToDeal.media_attachments);