1 files changed, 57 insertions, 36 deletions

diff --git a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
index eb9dd05f9..4a8a2f1f8 100644
--- a/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
+++ b/src/de/danoeh/antennapod/activity/FeedInfoActivity.java
@@ -1,5 +1,6 @@
 package de.danoeh.antennapod.activity;
 
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.util.Log;
@@ -14,8 +15,8 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.asynctask.ImageLoader;
 import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.feed.Feed;
-import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.preferences.UserPreferences;
+import de.danoeh.antennapod.storage.DBReader;
 import de.danoeh.antennapod.storage.DownloadRequestException;
 import de.danoeh.antennapod.util.LangUtils;
 import de.danoeh.antennapod.util.menuhandler.FeedMenuHandler;
@@ -41,47 +42,66 @@ public class FeedInfoActivity extends ActionBarActivity {
 		setContentView(R.layout.feedinfo);
 		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		long feedId = getIntent().getLongExtra(EXTRA_FEED_ID, -1);
-		FeedManager manager = FeedManager.getInstance();
-		feed = manager.getFeed(feedId);
-		if (feed != null) {
-			if (AppConfig.DEBUG)
-				Log.d(TAG, "Language is " + feed.getLanguage());
-			if (AppConfig.DEBUG)
-				Log.d(TAG, "Author is " + feed.getAuthor());
-			imgvCover = (ImageView) findViewById(R.id.imgvCover);
-			txtvTitle = (TextView) findViewById(R.id.txtvTitle);
-			txtvDescription = (TextView) findViewById(R.id.txtvDescription);
-			txtvLanguage = (TextView) findViewById(R.id.txtvLanguage);
-			txtvAuthor = (TextView) findViewById(R.id.txtvAuthor);
-			imgvCover.post(new Runnable() {
+		
+		AsyncTask<Long, Void, Feed> loadTask = new AsyncTask<Long, Void, Feed>() {
 
-				@Override
-				public void run() {
-					ImageLoader.getInstance().loadThumbnailBitmap(
-							feed.getImage(), imgvCover);
-				}
-			});
-
-			txtvTitle.setText(feed.getTitle());
-			txtvDescription.setText(feed.getDescription());
-			if (feed.getAuthor() != null) {
-				txtvAuthor.setText(feed.getAuthor());
-			}
-			if (feed.getLanguage() != null) {
-				txtvLanguage.setText(LangUtils.getLanguageString(feed
-						.getLanguage()));
+			@Override
+			protected Feed doInBackground(Long... params) {
+				return DBReader.getFeed(FeedInfoActivity.this, params[0]);
 			}
-		} else {
-			Log.e(TAG, "Activity was started with invalid arguments");
-		}
 
+			@Override
+			protected void onPostExecute(Feed result) {
+				super.onPostExecute(result);
+				if (result != null) {
+					feed = result;
+					if (feed != null) {
+						if (AppConfig.DEBUG)
+							Log.d(TAG, "Language is " + feed.getLanguage());
+						if (AppConfig.DEBUG)
+							Log.d(TAG, "Author is " + feed.getAuthor());
+						imgvCover = (ImageView) findViewById(R.id.imgvCover);
+						txtvTitle = (TextView) findViewById(R.id.txtvTitle);
+						txtvDescription = (TextView) findViewById(R.id.txtvDescription);
+						txtvLanguage = (TextView) findViewById(R.id.txtvLanguage);
+						txtvAuthor = (TextView) findViewById(R.id.txtvAuthor);
+						imgvCover.post(new Runnable() {
+
+							@Override
+							public void run() {
+								ImageLoader.getInstance().loadThumbnailBitmap(
+										feed.getImage(), imgvCover);
+							}
+						});
+
+						txtvTitle.setText(feed.getTitle());
+						txtvDescription.setText(feed.getDescription());
+						if (feed.getAuthor() != null) {
+							txtvAuthor.setText(feed.getAuthor());
+						}
+						if (feed.getLanguage() != null) {
+							txtvLanguage.setText(LangUtils
+									.getLanguageString(feed.getLanguage()));
+						}
+                        supportInvalidateOptionsMenu();
+					}
+				} else {
+					Log.e(TAG, "Activity was started with invalid arguments");
+				}
+			}
+		};
+		loadTask.execute(feedId);
 	}
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = new MenuInflater(this);
-		inflater.inflate(R.menu.feedinfo, menu);
-		return true;
+        if (feed != null) {
+            MenuInflater inflater = new MenuInflater(this);
+            inflater.inflate(R.menu.feedinfo, menu);
+            return true;
+        } else {
+            return false;
+        }
 	}
 
 	@Override
@@ -104,7 +124,8 @@ public class FeedInfoActivity extends ActionBarActivity {
 				return FeedMenuHandler.onOptionsItemClicked(this, item, feed);
 			} catch (DownloadRequestException e) {
 				e.printStackTrace();
-				DownloadRequestErrorDialogCreator.newRequestErrorDialog(this, e.getMessage());
+				DownloadRequestErrorDialogCreator.newRequestErrorDialog(this,
+						e.getMessage());
 			}
 			return super.onOptionsItemSelected(item);
 		}