From 277282d7f581a3a99485125cd4789adc54d2b34e Mon Sep 17 00:00:00 2001 From: sk Date: Wed, 28 Jun 2023 01:35:37 +0200 Subject: [PATCH] fix first notifications loaded multiple times closes sk22#616 --- .../joinmastodon/android/fragments/HomeTimelineFragment.java | 2 +- .../android/fragments/NotificationsListFragment.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java index 97545a1f84..6b60cbcf9f 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java @@ -66,8 +66,8 @@ protected void doLoadData(int offset, int count){ public void onSuccess(CacheablePaginatedResponse> result){ if (getActivity() == null) return; List filteredItems = filterPosts(result.items); - onDataLoaded(filteredItems, !result.items.isEmpty()); maxID=result.maxID; + onDataLoaded(filteredItems, !result.items.isEmpty()); if(result.isFromCache()) loadNewPosts(); } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java index c01d88f152..a8dfc1c392 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java @@ -150,13 +150,13 @@ public void onSuccess(CacheablePaginatedResponse> result){ if (getActivity() == null) return; if(refreshing) relationships.clear(); + maxID=result.maxID; onDataLoaded(result.items.stream().filter(n->n.type!=null).collect(Collectors.toList()), !result.items.isEmpty()); Set needRelationships=result.items.stream() .filter(ntf->ntf.status==null && !relationships.containsKey(ntf.account.id)) .map(ntf->ntf.account.id) .collect(Collectors.toSet()); loadRelationships(needRelationships); - maxID=result.maxID; Markers markers = AccountSessionManager.getInstance().getAccount(accountID).markers; if(offset==0 && !result.items.isEmpty() && !result.isFromCache() && markers != null && markers.notifications != null){