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 1babc4e2..dd58df77 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 @@ -3117,9 +3117,10 @@ public class StatusAdapter extends RecyclerView.Adapter } else { if (isVisible(timelineType, statusList.get(position), statusList)) { if (visiblePixelfed && isVisiblePixelfed(statusList.get(position)) && timelineType != Timeline.TimeLineEnum.UNKNOWN) { - return STATUS_PIXELFED; - } else { + } else if(timelineType == Timeline.TimeLineEnum.REMOTE && pinnedTimeline != null && pinnedTimeline.remoteInstance != null && pinnedTimeline.remoteInstance.type == RemoteInstance.InstanceType.PIXELFED){ + return STATUS_PIXELFED; + }else { if(timelineType != Timeline.TimeLineEnum.UNKNOWN && getCurrentAccount(context).software != null && getCurrentAccount(context).software.trim().toLowerCase().equals("pixelfed")) { return STATUS_PIXELFED; } else { diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java index b6131c3e..87d14e84 100644 --- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java +++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java @@ -1131,6 +1131,8 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter. if (direction == null) { timelinesVM.getPixelfedDiscoverTrending(remoteInstance) .observe(getViewLifecycleOwner(), this::initializeStatusesCommonView); + } else { + binding.swipeContainer.setRefreshing(false); } }else { //Other remote timelines routeCommon(direction, fetchingMissing, fetchStatus);