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

Fix crash.

Browse source
This commit is contained in:
dosiecki 2014-12-29 00:20:32 -08:00
parent 055ea6a9a5
commit 1d4c1556e3
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/android/NewsBlur/src/com/newsblur/database/BlurDatabaseHelper.java
View file

@ -590,12 +590,14 @@ public class BlurDatabaseHelper {
} }
public Cursor getStoriesCursor(FeedSet fs, StateFilter stateFilter, CancellationSignal cancellationSignal) { public Cursor getStoriesCursor(FeedSet fs, StateFilter stateFilter, CancellationSignal cancellationSignal) {
if (fs == null) return null;
ReadFilter readFilter = PrefsUtils.getReadFilter(context, fs); ReadFilter readFilter = PrefsUtils.getReadFilter(context, fs);
StoryOrder order = PrefsUtils.getStoryOrder(context, fs); StoryOrder order = PrefsUtils.getStoryOrder(context, fs);
return getStoriesCursor(fs, stateFilter, readFilter, order, cancellationSignal); return getStoriesCursor(fs, stateFilter, readFilter, order, cancellationSignal);
} }
private Cursor getStoriesCursor(FeedSet fs, StateFilter stateFilter, ReadFilter readFilter, StoryOrder order, CancellationSignal cancellationSignal) { private Cursor getStoriesCursor(FeedSet fs, StateFilter stateFilter, ReadFilter readFilter, StoryOrder order, CancellationSignal cancellationSignal) {
if (fs == null) return null;
if (fs.getSingleFeed() != null) { if (fs.getSingleFeed() != null) {

1
clients/android/NewsBlur/src/com/newsblur/fragment/FolderListFragment.java
View file

@ -90,6 +90,7 @@ public class FolderListFragment extends NbFragment implements OnGroupClickListen
@Override @Override
public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) { public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
if (cursor == null) return;
try { try {
switch (loader.getId()) { switch (loader.getId()) {
case SOCIALFEEDS_LOADER: case SOCIALFEEDS_LOADER: