Mastodon
/
Yuito-app-android
mirror of https://github.com/accelforce/Yuito
1
0
Fork 0
Code Issues Releases Wiki Activity

fix notification tab loading bottom notifications forever (#807)

This commit is contained in:
Konrad Pozniak 2018-08-26 21:10:38 +02:00 committed by GitHub
parent 1d28f4728f
commit b579a9baea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java
View File

@ -207,7 +207,7 @@ public class NotificationsFragment extends SFragment implements
((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false); ((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false);
setupNothingView(); setupNothingView();
sendFetchNotificationsRequest(null, topId, FetchEnd.TOP, -1); sendFetchNotificationsRequest(null, topId, FetchEnd.BOTTOM, -1);
return rootView; return rootView;
} }
@ -551,6 +551,10 @@ public class NotificationsFragment extends SFragment implements
} }
private void onLoadMore() { private void onLoadMore() {
if(bottomId == null) {
// already loaded everything
return;
}
Either<Placeholder, Notification> last = notifications.get(notifications.size() - 1); Either<Placeholder, Notification> last = notifications.get(notifications.size() - 1);
if (last.isRight()) { if (last.isRight()) {
notifications.add(Either.left(Placeholder.getInstance())); notifications.add(Either.left(Placeholder.getInstance()));
@ -741,12 +745,10 @@ public class NotificationsFragment extends SFragment implements
} }
private void addItems(List<Notification> newNotifications, @Nullable String fromId) { private void addItems(List<Notification> newNotifications, @Nullable String fromId) {
bottomId = fromId;
if (ListUtils.isEmpty(newNotifications)) { if (ListUtils.isEmpty(newNotifications)) {
return; return;
} }
if (fromId != null) {
bottomId = fromId;
}
int end = notifications.size(); int end = notifications.size();
List<Either<Placeholder, Notification>> liftedNew = liftNotificationList(newNotifications); List<Either<Placeholder, Notification>> liftedNew = liftNotificationList(newNotifications);
Either<Placeholder, Notification> last = notifications.get(end - 1); Either<Placeholder, Notification> last = notifications.get(end - 1);