From 2eb36e0bbee4e868b4676bfba6b454ee5d5c04ae Mon Sep 17 00:00:00 2001 From: dosiecki Date: Fri, 27 Apr 2018 14:46:47 -0700 Subject: [PATCH] remove pre-recyclerview loader workaround --- .../NewsBlur/src/com/newsblur/activity/ItemsList.java | 6 ------ .../src/com/newsblur/fragment/ItemSetFragment.java | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/ItemsList.java b/clients/android/NewsBlur/src/com/newsblur/activity/ItemsList.java index 37c8cb796..bf242c401 100644 --- a/clients/android/NewsBlur/src/com/newsblur/activity/ItemsList.java +++ b/clients/android/NewsBlur/src/com/newsblur/activity/ItemsList.java @@ -381,12 +381,6 @@ public abstract class ItemsList extends NbActivity implements StoryOrderChangedL @Override public void finish() { - if (itemSetFragment != null) { - // since v6.0 of Android, the ListView in the fragment likes to crash if the underlying - // dataset changes rapidly as happens when marking-all-read and when the fragment is - // stopping. do a manual hard-stop of the loaders in the fragment before we finish - itemSetFragment.stopLoader(); - } super.finish(); /* * Animate out the list by sliding it to the right and the Main activity in from diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemSetFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemSetFragment.java index 7514bc515..ec8141ef6 100644 --- a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemSetFragment.java +++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemSetFragment.java @@ -43,7 +43,6 @@ public class ItemSetFragment extends NbFragment implements LoaderManager.LoaderC private static final String BUNDLE_GRIDSTATE = "gridstate"; protected boolean cursorSeenYet = false; // have we yet seen a valid cursor for our particular feedset? - private boolean stopLoading = false; private int itemGridWidthPx = 0; private int columnCount; @@ -93,7 +92,6 @@ public class ItemSetFragment extends NbFragment implements LoaderManager.LoaderC @Override public void onStart() { super.onStart(); - stopLoading = false; } @Override @@ -213,13 +211,6 @@ public class ItemSetFragment extends NbFragment implements LoaderManager.LoaderC if (gotSome || (totalSeen == null)) triggerSync(); } - /** - * Signal that all futher cursor loads should be ignored - */ - public void stopLoader() { - stopLoading = true; - } - /** * Indicate that the DB was cleared. */ @@ -273,7 +264,6 @@ public class ItemSetFragment extends NbFragment implements LoaderManager.LoaderC @Override public synchronized void onLoadFinished(Loader loader, Cursor cursor) { - if (stopLoading) return; if (cursor != null) { if (! FeedUtils.dbHelper.isFeedSetReady(getFeedSet())) { // the DB hasn't caught up yet from the last story list; don't display stale stories.