Merge branch 'feedmanager_removal' into develop

Conflicts:
	src/de/danoeh/antennapod/activity/DownloadLogActivity.java
	src/de/danoeh/antennapod/activity/FeedItemlistActivity.java
	src/de/danoeh/antennapod/activity/ItemviewActivity.java
	src/de/danoeh/antennapod/activity/MiroGuideChannelViewActivity.java
	src/de/danoeh/antennapod/activity/OrganizeQueueActivity.java
	src/de/danoeh/antennapod/activity/PreferenceActivity.java
	src/de/danoeh/antennapod/fragment/EpisodesFragment.java
	src/de/danoeh/antennapod/fragment/FeedlistFragment.java
	src/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
	src/de/danoeh/antennapod/fragment/ItemlistFragment.java

1 files changed, 4 insertions, 8 deletions

diff --git a/src/de/danoeh/antennapod/activity/MainActivity.java b/src/de/danoeh/antennapod/activity/MainActivity.java
index ae592fbdc..92b56461c 100644
--- a/src/de/danoeh/antennapod/activity/MainActivity.java
+++ b/src/de/danoeh/antennapod/activity/MainActivity.java
@@ -20,13 +20,14 @@ import android.view.Window;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.feed.EventDistributor;
-import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.fragment.EpisodesFragment;
 import de.danoeh.antennapod.fragment.ExternalPlayerFragment;
 import de.danoeh.antennapod.fragment.FeedlistFragment;
 import de.danoeh.antennapod.preferences.UserPreferences;
 import de.danoeh.antennapod.service.PlaybackService;
 import de.danoeh.antennapod.service.download.DownloadService;
+import de.danoeh.antennapod.storage.DBReader;
+import de.danoeh.antennapod.storage.DBTasks;
 import de.danoeh.antennapod.storage.DownloadRequester;
 import de.danoeh.antennapod.util.StorageUtils;
 
@@ -37,7 +38,6 @@ public class MainActivity extends ActionBarActivity {
 	private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED
 			| EventDistributor.DOWNLOAD_QUEUED;
 
-	private FeedManager manager;
 	private ViewPager viewpager;
 	private TabsAdapter pagerAdapter;
 	private ExternalPlayerFragment externalPlayerFragment;
@@ -49,7 +49,6 @@ public class MainActivity extends ActionBarActivity {
 		setTheme(UserPreferences.getTheme());
 		super.onCreate(savedInstanceState);
 		StorageUtils.checkStorageAvailability(this);
-		manager = FeedManager.getInstance();
 		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		setContentView(R.layout.main);
 
@@ -78,7 +77,7 @@ public class MainActivity extends ActionBarActivity {
 		if (!appLaunched && getIntent().getAction() != null
 				&& getIntent().getAction().equals(Intent.ACTION_MAIN)) {
 			appLaunched = true;
-			if (manager.getUnreadItemsSize(true) > 0) {
+			if (DBReader.getNumberOfUnreadItems(this) > 0) {
 				// select 'episodes' tab
 				getSupportActionBar().setSelectedNavigationItem(1);
 			}
@@ -140,7 +139,7 @@ public class MainActivity extends ActionBarActivity {
 			startActivity(new Intent(this, AddFeedActivity.class));
 			return true;
 		case R.id.all_feed_refresh:
-			manager.refreshAllFeeds(this);
+			DBTasks.refreshAllFeeds(this, null);
 			return true;
 		case R.id.show_downloads:
 			startActivity(new Intent(this, DownloadActivity.class));
@@ -171,9 +170,6 @@ public class MainActivity extends ActionBarActivity {
 		} else {
 			refreshAll.setVisible(true);
 		}
-
-		boolean hasFeeds = manager.getFeedsSize() > 0;
-		menu.findItem(R.id.all_feed_refresh).setVisible(hasFeeds);
 		return true;
 	}