public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't poll DB from UI thread when creating story fragments

Browse source
This commit is contained in:
dosiecki 2018-07-22 14:20:30 -07:00
parent 984eeb13bb
commit 90bc3ac209
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
clients/android/NewsBlur/src/com/newsblur/database/ReadingAdapter.java
View file

@ -21,8 +21,10 @@ import com.newsblur.util.FeedUtils;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
@ -47,6 +49,9 @@ public class ReadingAdapter extends PagerAdapter {
// the live list of stories being used by the adapter // the live list of stories being used by the adapter
private List<Story> stories = new ArrayList<Story>(0); private List<Story> stories = new ArrayList<Story>(0);
// classifiers for each feed seen in the story list
private Map<String,Classifier> classifiers = new HashMap<String,Classifier>(0);
private final ExecutorService executorService; private final ExecutorService executorService;
public ReadingAdapter(FragmentManager fm, String sourceUserId, boolean showFeedMetadata, Reading activity) { public ReadingAdapter(FragmentManager fm, String sourceUserId, boolean showFeedMetadata, Reading activity) {
@ -93,15 +98,24 @@ public class ReadingAdapter extends PagerAdapter {
} else { } else {
if (c.isClosed()) return; if (c.isClosed()) return;
newStories = new ArrayList<Story>(c.getCount()); newStories = new ArrayList<Story>(c.getCount());
// keep track of which feeds are in this story set so we can also fetch Classifiers
Set<String> feedIdsSeen = new HashSet<String>();
c.moveToPosition(-1); c.moveToPosition(-1);
while (c.moveToNext()) { while (c.moveToNext()) {
if (c.isClosed()) return; if (c.isClosed()) return;
Story s = Story.fromCursor(c); Story s = Story.fromCursor(c);
s.bindExternValues(c); s.bindExternValues(c);
newStories.add(s); newStories.add(s);
feedIdsSeen.add(s.feedId);
}
for (String feedId : feedIdsSeen) {
classifiers.put(feedId, FeedUtils.dbHelper.getClassifierForFeed(feedId));
} }
} }
} catch (Exception e) { } catch (Exception e) {
// because we use interruptable loaders that auto-close cursors, it is expected
// that cursors will sometimes go bad. this is a useful signal to stop the thaw
// thread and let it start on a fresh cursor.
com.newsblur.util.Log.e(this, "error thawing story list: " + e.getMessage(), e); com.newsblur.util.Log.e(this, "error thawing story list: " + e.getMessage(), e);
return; return;
} }
@ -133,9 +147,6 @@ public class ReadingAdapter extends PagerAdapter {
} }
private ReadingItemFragment createFragment(Story story) { private ReadingItemFragment createFragment(Story story) {
// TODO: classifiers should be pre-fetched by loaders?
Classifier classifier = FeedUtils.dbHelper.getClassifierForFeed(story.feedId);
return ReadingItemFragment.newInstance(story, return ReadingItemFragment.newInstance(story,
story.extern_feedTitle, story.extern_feedTitle,
story.extern_feedColor, story.extern_feedColor,
@ -143,7 +154,7 @@ public class ReadingAdapter extends PagerAdapter {
story.extern_faviconBorderColor, story.extern_faviconBorderColor,
story.extern_faviconTextColor, story.extern_faviconTextColor,
story.extern_faviconUrl, story.extern_faviconUrl,
classifier, classifiers.get(story.feedId),
showFeedMetadata, showFeedMetadata,
sourceUserId); sourceUserId);
} }