1 files changed, 53 insertions, 60 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java
index 62ae28820..e382a5888 100644
--- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java
@@ -7,80 +7,73 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import de.danoeh.antennapod.core.BuildConfig;
+
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.service.download.DownloadService;
 import de.danoeh.antennapod.core.storage.DBTasks;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.storage.DownloadRequestException;
-import de.danoeh.antennapod.core.storage.DownloadRequester;
 import de.danoeh.antennapod.core.util.ShareUtils;
 
-/** Handles interactions with the FeedItemMenu. */
+/**
+ * Handles interactions with the FeedItemMenu.
+ */
 public class FeedMenuHandler {
-	private static final String TAG = "FeedMenuHandler";
+    private static final String TAG = "FeedMenuHandler";
 
-	public static boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu) {
-		inflater.inflate(R.menu.feedlist, menu);
-		return true;
-	}
+    public static boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu) {
+        inflater.inflate(R.menu.feedlist, menu);
+        return true;
+    }
 
-	public static boolean onPrepareOptionsMenu(Menu menu, Feed selectedFeed) {
+    public static boolean onPrepareOptionsMenu(Menu menu, Feed selectedFeed) {
         if (selectedFeed == null) {
             return true;
         }
 
-		if (BuildConfig.DEBUG)
-			Log.d(TAG, "Preparing options menu");
-		menu.findItem(R.id.mark_all_read_item).setVisible(
-				selectedFeed.hasNewItems(true));
-		if (selectedFeed.getPaymentLink() != null && selectedFeed.getFlattrStatus().flattrable()) 
-			menu.findItem(R.id.support_item).setVisible(true);
-		else
-			menu.findItem(R.id.support_item).setVisible(false);	
-		MenuItem refresh = menu.findItem(R.id.refresh_item);
-		if (DownloadService.isRunning
-				&& DownloadRequester.getInstance().isDownloadingFile(
-						selectedFeed)) {
-			refresh.setVisible(false);
-		} else {
-			refresh.setVisible(true);
-		}
+        if (BuildConfig.DEBUG)
+            Log.d(TAG, "Preparing options menu");
+        menu.findItem(R.id.mark_all_read_item).setVisible(
+                selectedFeed.hasNewItems(true));
+        if (selectedFeed.getPaymentLink() != null && selectedFeed.getFlattrStatus().flattrable())
+            menu.findItem(R.id.support_item).setVisible(true);
+        else
+            menu.findItem(R.id.support_item).setVisible(false);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * NOTE: This method does not handle clicks on the 'remove feed' - item.
-	 * 
-	 * @throws DownloadRequestException
-	 */
-	public static boolean onOptionsItemClicked(Context context, MenuItem item,
-			Feed selectedFeed) throws DownloadRequestException {
-		switch (item.getItemId()) {
-		case R.id.refresh_item:
-			DBTasks.refreshFeed(context, selectedFeed);
-			break;
-		case R.id.mark_all_read_item:
-			DBWriter.markFeedRead(context, selectedFeed.getId());
-			break;
-		case R.id.visit_website_item:
-			Uri uri = Uri.parse(selectedFeed.getLink());
-			context.startActivity(new Intent(Intent.ACTION_VIEW, uri));
-			break;
-		case R.id.support_item:
-			DBTasks.flattrFeedIfLoggedIn(context, selectedFeed);
-			break;
-		case R.id.share_link_item:
-			ShareUtils.shareFeedlink(context, selectedFeed);
-			break;
-		case R.id.share_source_item:
-			ShareUtils.shareFeedDownloadLink(context, selectedFeed);
-			break;
-		default:
-			return false;
-		}
-		return true;
-	}
+    /**
+     * NOTE: This method does not handle clicks on the 'remove feed' - item.
+     *
+     * @throws DownloadRequestException
+     */
+    public static boolean onOptionsItemClicked(Context context, MenuItem item,
+                                               Feed selectedFeed) throws DownloadRequestException {
+        switch (item.getItemId()) {
+            case R.id.refresh_item:
+                DBTasks.refreshFeed(context, selectedFeed);
+                break;
+            case R.id.mark_all_read_item:
+                DBWriter.markFeedRead(context, selectedFeed.getId());
+                break;
+            case R.id.visit_website_item:
+                Uri uri = Uri.parse(selectedFeed.getLink());
+                context.startActivity(new Intent(Intent.ACTION_VIEW, uri));
+                break;
+            case R.id.support_item:
+                DBTasks.flattrFeedIfLoggedIn(context, selectedFeed);
+                break;
+            case R.id.share_link_item:
+                ShareUtils.shareFeedlink(context, selectedFeed);
+                break;
+            case R.id.share_source_item:
+                ShareUtils.shareFeedDownloadLink(context, selectedFeed);
+                break;
+            default:
+                return false;
+        }
+        return true;
+    }
 }