mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2024-12-22 16:50:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix_511' into develop

Browse source
This commit is contained in:
Thomas 2024-01-23 16:49:48 +01:00
commit eb89b0a8b2
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
View file

@ -907,6 +907,7 @@ public class Helper {
fragment = _fragment; fragment = _fragment;
} else { } else {
if (args != null) fragment.setArguments(args); if (args != null) fragment.setArguments(args);
ft = fragmentManager.beginTransaction();
ft.add(containerViewId, fragment, tag); ft.add(containerViewId, fragment, tag);
if (backStackName != null) ft.addToBackStack(backStackName); if (backStackName != null) ft.addToBackStack(backStackName);
if (!fragmentManager.isDestroyed()) { if (!fragmentManager.isDestroyed()) {

6
app/src/main/java/app/fedilab/android/mastodon/ui/fragment/timeline/FragmentMastodonTimeline.java
View file

@ -1144,7 +1144,7 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
} }
initializeStatusesCommonView(otherStatuses); initializeStatusesCommonView(otherStatuses);
})); }));
} else { } else if(accountTimeline != null){
tempToken[0] = MainActivity.currentToken; tempToken[0] = MainActivity.currentToken;
tempInstance[0] = currentInstance; tempInstance[0] = currentInstance;
accountId[0] = accountTimeline.id; accountId[0] = accountTimeline.id;
@ -1155,12 +1155,12 @@ public class FragmentMastodonTimeline extends Fragment implements StatusAdapter.
} else { } else {
accountId[0] = accountIDInRemoteInstance; accountId[0] = accountIDInRemoteInstance;
} }
} else { } else if(accountTimeline != null){
tempToken[0] = MainActivity.currentToken; tempToken[0] = MainActivity.currentToken;
tempInstance[0] = currentInstance; tempInstance[0] = currentInstance;
accountId[0] = accountTimeline.id; accountId[0] = accountTimeline.id;
} }
if (accountId[0] == null) { if (accountId[0] == null && accountTimeline != null) {
accountId[0] = accountTimeline.id; accountId[0] = accountTimeline.id;
} }
displayStatuses(direction, accountId[0], tempInstance[0], tempToken[0], fetchStatus); displayStatuses(direction, accountId[0], tempInstance[0], tempToken[0], fetchStatus);