Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

some fixes

This commit is contained in:
Thomas 2022-08-02 10:40:27 +02:00
parent 83bacc12ea
commit 0a15ab2cf8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,15 +153,16 @@ public class FragmentMastodonAccount extends Fragment {
} }
accountsVM.getRelationships(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, ids) accountsVM.getRelationships(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, ids)
.observe(getViewLifecycleOwner(), relationShips -> { .observe(getViewLifecycleOwner(), relationShips -> {
if (relationShips != null) {
for (RelationShip relationShip : relationShips) { for (RelationShip relationShip : relationShips) {
for (Account account : accounts) { for (Account account : accounts) {
if (account.id.compareToIgnoreCase(relationShip.id) == 0) { if (account.id.compareToIgnoreCase(relationShip.id) == 0) {
account.relationShip = relationShip; account.relationShip = relationShip;
}
} }
} }
accountAdapter.notifyItemRangeChanged(position, accounts.size());
} }
accountAdapter.notifyItemRangeChanged(position, accounts.size());
}); });
} }

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

@ -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())) 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(), 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 -> { .observe(getViewLifecycleOwner(), otherStatuses -> {
if (otherStatuses != null && otherStatuses.statuses != null) { if (otherStatuses != null && otherStatuses.statuses != null && pinnedStatuses != null) {
for (Status status : pinnedStatuses.statuses) { for (Status status : pinnedStatuses.statuses) {
status.pinned = true; status.pinned = true;
} }