fix first notifications loaded multiple times

closes #616
sk22 · Jun 27, 2023 · 277282d · 277282d
1 parent 664851c
commit 277282d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -66,8 +66,8 @@ protected void doLoadData(int offset, int count){
 					public void onSuccess(CacheablePaginatedResponse<List<Status>> result){
 						if (getActivity() == null) return;
 						List<Status> 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
@@ -150,13 +150,13 @@ public void onSuccess(CacheablePaginatedResponse<List<Notification>> 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<String> 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){