Commit 0a15ab2c authored Aug 02, 2022 by Thomas

some fixes

parent 83bacc12

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonAccount.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ public class FragmentMastodonAccount extends Fragment {
		}
		accountsVM.getRelationships(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, ids)
		.observe(getViewLifecycleOwner(), relationShips -> {

		if (relationShips != null) {
		for (RelationShip relationShip : relationShips) {
		for (Account account : accounts) {
		if (account.id.compareToIgnoreCase(relationShip.id) == 0) {
		@@ -162,6 +162,7 @@ public class FragmentMastodonAccount extends Fragment {
		}
		}
		accountAdapter.notifyItemRangeChanged(position, accounts.size());
		}
		});
		}

app/src/main/java/app/fedilab/android/ui/fragment/timeline/FragmentMastodonTimeline.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -788,7 +788,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
		accountsVM.getAccountStatuses(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountTimeline.id, null, null, null, null, null, false, true, MastodonHelper.statusesPerCall(requireActivity()))
		.observe(getViewLifecycleOwner(), pinnedStatuses -> accountsVM.getAccountStatuses(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, accountTimeline.id, null, null, null, exclude_replies, exclude_reblogs, media_only, false, MastodonHelper.statusesPerCall(requireActivity()))
		.observe(getViewLifecycleOwner(), otherStatuses -> {
		if (otherStatuses != null && otherStatuses.statuses != null) {
		if (otherStatuses != null && otherStatuses.statuses != null && pinnedStatuses != null) {
		for (Status status : pinnedStatuses.statuses) {
		status.pinned = true;
		}