diff options
| -rw-r--r-- | app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java b/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java index decb29d7f..cbcb540c2 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java +++ b/app/src/main/java/app/fedilab/android/mastodon/activities/SearchResultTabActivity.java @@ -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)); } /** diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java index 8304bd948..191780ce8 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/drawer/StatusAdapter.java @@ -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); |