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

Merge pull request #619 from dosiecki/master

Browse source 
Android: Bugfixes
This commit is contained in:
Samuel Clay 2014-11-18 13:44:20 -08:00
commit 1c5d6f9e77
2 changed files with 26 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,8 +56,10 @@ public class BlurDatabaseHelper {
public BlurDatabaseHelper(Context context) {
this.context = context;
dbWrapper = new BlurDatabase(context);
dbRO = dbWrapper.getRO();
dbRW = dbWrapper.getRW();
synchronized (RW_MUTEX) {
dbRO = dbWrapper.getRO();
dbRW = dbWrapper.getRW();
}
}
public void close() {

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

@ -88,23 +88,29 @@ public class FolderListFragment extends NbFragment implements OnGroupClickListen
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
switch (loader.getId()) {
case SOCIALFEEDS_LOADER:
adapter.setSocialFeedCursor(cursor);
break;
case FOLDERFEEDMAP_LOADER:
adapter.setFolderFeedMapCursor(cursor);
break;
case FEEDS_LOADER:
adapter.setFeedCursor(cursor);
break;
case SAVEDCOUNT_LOADER:
adapter.setSavedCountCursor(cursor);
break;
default:
throw new IllegalArgumentException("unknown loader created");
try {
switch (loader.getId()) {
case SOCIALFEEDS_LOADER:
adapter.setSocialFeedCursor(cursor);
break;
case FOLDERFEEDMAP_LOADER:
adapter.setFolderFeedMapCursor(cursor);
break;
case FEEDS_LOADER:
adapter.setFeedCursor(cursor);
break;
case SAVEDCOUNT_LOADER:
adapter.setSavedCountCursor(cursor);
break;
default:
throw new IllegalArgumentException("unknown loader created");
}
checkOpenFolderPreferences();
} catch (Exception e) {
// for complex folder sets, these ops can take so long that they butt heads
// with the destruction of the fragment and adapter. crashes can ensue.
Log.w(this.getClass().getName(), "failed up update fragment state", e);
}
checkOpenFolderPreferences();
}
@Override