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

Switch all activities to use global DB helper.

Browse source
This commit is contained in:
dosiecki 2014-12-29 00:07:30 -08:00
parent 276bca54a2
commit 055ea6a9a5
8 changed files with 10 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/android/NewsBlur/src/com/newsblur/activity/FolderItemsList.java
View file

@ -54,7 +54,7 @@ public class FolderItemsList extends ItemsList implements MarkAllReadDialogListe
@Override
protected FeedSet createFeedSet() {
return FeedSet.folder(this.folderName, dbHelper.getFeedsForFolder(folderName));
return FeedSet.folder(this.folderName, FeedUtils.dbHelper.getFeedsForFolder(folderName));
}
@Override

16
clients/android/NewsBlur/src/com/newsblur/activity/NbActivity.java
View file

@ -5,7 +5,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import com.newsblur.database.BlurDatabaseHelper;
import com.newsblur.service.NBSyncService;
import com.newsblur.util.AppConstants;
import com.newsblur.util.PrefsUtils;
@ -21,8 +20,6 @@ public class NbActivity extends Activity {
private final static String UNIQUE_LOGIN_KEY = "uniqueLoginKey";
private String uniqueLoginKey;
protected BlurDatabaseHelper dbHelper;
/**
* Keep track of all activie activities so they can be notified when the sync service
* has updated the DB. This is essentially an ultra-lightweight implementation of a
@ -45,21 +42,8 @@ public class NbActivity extends Activity {
uniqueLoginKey = PrefsUtils.getUniqueLoginKey(this);
}
finishIfNotLoggedIn();
dbHelper = new BlurDatabaseHelper(this);
}
@Override
public void onDestroy() {
try {
dbHelper.close();
} catch (Exception e) {
; // Activity is already dead
}
super.onDestroy();
}
@Override
protected void onResume() {
if (AppConstants.VERBOSE_LOG) Log.d(this.getClass().getName(), "onResume");

4
clients/android/NewsBlur/src/com/newsblur/activity/Reading.java
View file

@ -191,7 +191,7 @@ public abstract class Reading extends NbActivity implements OnPageChangeListener
@Override
public Loader<Cursor> onCreateLoader(int loaderId, Bundle bundle) {
return dbHelper.getStoriesLoader(fs, currentState);
return FeedUtils.dbHelper.getStoriesLoader(fs, currentState);
}
@Override
@ -259,7 +259,7 @@ public abstract class Reading extends NbActivity implements OnPageChangeListener
*/
private int getUnreadCount() {
if (fs.isAllSaved()) return 0; // saved stories doesn't have unreads
return dbHelper.getUnreadCount(fs, currentState);
return FeedUtils.dbHelper.getUnreadCount(fs, currentState);
}
@Override

2
clients/android/NewsBlur/src/com/newsblur/activity/SavedStoriesReading.java
View file

@ -26,7 +26,7 @@ public class SavedStoriesReading extends Reading {
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor cursor) {
// every time we see a set of saved stories, tag them so they don't disappear during this reading session
dbHelper.markSavedReadingSession();
FeedUtils.dbHelper.markSavedReadingSession();
super.onLoadFinished(loader, cursor);
}

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

@ -76,13 +76,13 @@ public class FolderListFragment extends NbFragment implements OnGroupClickListen
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
switch (id) {
case SOCIALFEEDS_LOADER:
return dbHelper.getSocialFeedsLoader(currentState);
return FeedUtils.dbHelper.getSocialFeedsLoader(currentState);
case FOLDERFEEDMAP_LOADER:
return dbHelper.getFolderFeedMapLoader();
return FeedUtils.dbHelper.getFolderFeedMapLoader();
case FEEDS_LOADER:
return dbHelper.getFeedsLoader(currentState);
return FeedUtils.dbHelper.getFeedsLoader(currentState);
case SAVEDCOUNT_LOADER:
return dbHelper.getSavedStoryCountLoader();
return FeedUtils.dbHelper.getSavedStoryCountLoader();
default:
throw new IllegalArgumentException("unknown loader created");
}

2
clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
View file

@ -158,7 +158,7 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
@Override
public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
return dbHelper.getStoriesLoader(getFeedSet(), currentState);
return FeedUtils.dbHelper.getStoriesLoader(getFeedSet(), currentState);
}
@Override

22
clients/android/NewsBlur/src/com/newsblur/fragment/NbFragment.java
View file

@ -5,32 +5,10 @@ import android.app.Fragment;
import android.content.Intent;
import android.os.Bundle;
import com.newsblur.database.BlurDatabaseHelper;
import com.newsblur.service.NBSyncService;
public class NbFragment extends Fragment {
protected BlurDatabaseHelper dbHelper;
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
dbHelper = new BlurDatabaseHelper(getActivity());
}
@Override
public void onDestroy() {
if (dbHelper != null) {
try {
dbHelper.close();
} catch (Exception e) {
; // Fragment is already dead
}
}
super.onDestroy();
}
/**
* Pokes the sync service to perform any pending sync actions.
*/

2
clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
View file

@ -37,7 +37,7 @@ import com.newsblur.util.AppConstants;
public class FeedUtils {
private static BlurDatabaseHelper dbHelper;
public static BlurDatabaseHelper dbHelper;
public static void offerDB(BlurDatabaseHelper _dbHelper) {
if (_dbHelper.isOpen()) {