public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1776 Ignore new stories while the story list is in the background

Browse source
This commit is contained in:
sictiru 2023-12-03 10:16:26 -08:00
parent 936850924d
commit 5a3bde4508
2 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
clients/android/NewsBlur/app/src/main/java/com/newsblur/database/StoryViewAdapter.java
View file

@ -24,9 +24,12 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.stream.Collectors;
import com.newsblur.R;
import com.newsblur.activity.FeedItemsList;
@ -195,12 +198,12 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
if (position >= getStoryCount()) {
return (footerViews.get(position - getStoryCount()).hashCode());
}
if (position >= stories.size() || position < 0) return 0;
return stories.get(position).storyHash.hashCode();
}
public void swapCursor(final Cursor c, final RecyclerView rv, Parcelable oldScrollState) {
public void swapCursor(final Cursor c, final RecyclerView rv, Parcelable oldScrollState, final boolean ignoreCursorNewStories) {
// cache the identity of the most recent cursor so async batches can check to
// see if they are stale
cursor = c;
@ -213,7 +216,7 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
Runnable r = new Runnable() {
@Override
public void run() {
thawDiffUpdate(c, rv);
thawDiffUpdate(c, rv, ignoreCursorNewStories);
}
};
executorService.submit(r);
@ -223,7 +226,7 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
* Attempt to thaw a new set of stories from the cursor most recently
* seen when the that cycle started.
*/
private void thawDiffUpdate(final Cursor c, final RecyclerView rv) {
private void thawDiffUpdate(final Cursor c, final RecyclerView rv, final boolean ignoreCursorNewStories) {
if (c != cursor) return;
// thawed stories
@ -234,14 +237,21 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
// as a new one will be provided and another cycle will start. just return.
try {
if (c == null) {
newStories = new ArrayList<Story>(0);
newStories = new ArrayList<>();
} else {
if (c.isClosed()) return;
newStories = new ArrayList<Story>(c.getCount());
newStories = new ArrayList<>(c.getCount());
c.moveToPosition(-1);
Set<String> currentStoryHashes = ignoreCursorNewStories ? stories.stream()
.map(story -> story.storyHash)
.collect(Collectors.toSet()) : Collections.emptySet();
while (c.moveToNext()) {
if (c.isClosed()) return;
Story s = Story.fromCursor(c);
if (ignoreCursorNewStories && !currentStoryHashes.contains(s.storyHash)) return;
s.bindExternValues(c);
newStories.add(s);
if (! s.read) indexOfLastUnread = c.getPosition();
@ -336,8 +346,8 @@ public class StoryViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
}
public class StoryViewHolder extends RecyclerView.ViewHolder
implements View.OnClickListener,
View.OnCreateContextMenuListener,
implements View.OnClickListener,
View.OnCreateContextMenuListener,
MenuItem.OnMenuItemClickListener,
View.OnTouchListener {

17
clients/android/NewsBlur/app/src/main/java/com/newsblur/fragment/ItemSetFragment.java
View file

@ -67,7 +67,19 @@ public class ItemSetFragment extends NbFragment {
private static final String BUNDLE_GRIDSTATE = "gridstate";
protected boolean cursorSeenYet = false; // have we yet seen a valid cursor for our particular feedset?
private boolean cursorSeenYet = false; // have we yet seen a valid cursor for our particular feedset?
/**
* Signal used to indicate that on resume the adapter
* shouldn't exclude any new stories and just update
* the existing stories within the adapter.
* This was added to avoid adding new stories that
* would make the list jump and loose scroll position
* while adding new stories that were back filled
* based on their timestamp.
* Remove signal once broader refactoring will be considered.
*/
private boolean ignoreCursorNewStories = false;
private int itemGridWidthPx = 0;
private int columnCount;
@ -119,6 +131,7 @@ public class ItemSetFragment extends NbFragment {
// readings and cause zero-index refreshes, wasting massive cycles. hold the refresh logic
// until the loaders reset
cursorSeenYet = false;
ignoreCursorNewStories = true;
super.onPause();
}
@ -280,7 +293,7 @@ public class ItemSetFragment extends NbFragment {
}
protected void updateAdapter(@Nullable Cursor cursor) {
adapter.swapCursor(cursor, binding.itemgridfragmentGrid, gridState);
adapter.swapCursor(cursor, binding.itemgridfragmentGrid, gridState, ignoreCursorNewStories);
gridState = null;
adapter.updateFeedSet(getFeedSet());
if ((cursor != null) && (cursor.getCount() > 0)) {