this consolidates the code from pull request #253 (flattr queue and auto flattr) into a single commit, rebased onto the current development branch

2 files changed, 12 insertions, 7 deletions

diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
index e99a733dc..53316f9a4 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
@@ -14,6 +14,7 @@ import de.danoeh.antennapod.storage.DownloadRequestException;
 import de.danoeh.antennapod.storage.DownloadRequester;
 import de.danoeh.antennapod.util.QueueAccess;
 import de.danoeh.antennapod.util.ShareUtils;
+import de.danoeh.antennapod.util.flattr.FlattrStatus;
 
 import java.util.List;
 
@@ -110,7 +111,7 @@ public class FeedItemMenuHandler {
 			mi.setItemVisibility(R.id.visit_website_item, false);
 		}
 
-		if (selectedItem.getPaymentLink() == null) {
+		if (selectedItem.getPaymentLink() == null || !selectedItem.getFlattrStatus().flattrable()) {
 			mi.setItemVisibility(R.id.support_item, false);
 		}
 		return true;
@@ -158,8 +159,9 @@ public class FeedItemMenuHandler {
 			context.startActivity(new Intent(Intent.ACTION_VIEW, uri));
 			break;
 		case R.id.support_item:
-			new FlattrClickWorker(context, selectedItem.getPaymentLink())
-					.executeAsync();
+			selectedItem.getFlattrStatus().setFlattrQueue();
+            DBWriter.setFlattredStatus(context, selectedItem);
+			new FlattrClickWorker(context).executeAsync();
 			break;
 		case R.id.share_link_item:
 			ShareUtils.shareFeedItemLink(context, selectedItem);
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
index 446e024d9..ad3ded88b 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
@@ -19,6 +19,7 @@ import de.danoeh.antennapod.storage.DBWriter;
 import de.danoeh.antennapod.storage.DownloadRequestException;
 import de.danoeh.antennapod.storage.DownloadRequester;
 import de.danoeh.antennapod.util.ShareUtils;
+import de.danoeh.antennapod.util.flattr.FlattrStatus;
 
 /** Handles interactions with the FeedItemMenu. */
 public class FeedMenuHandler {
@@ -38,9 +39,10 @@ public class FeedMenuHandler {
 			Log.d(TAG, "Preparing options menu");
 		menu.findItem(R.id.mark_all_read_item).setVisible(
 				selectedFeed.hasNewItems(true));
-		if (selectedFeed.getPaymentLink() != null) {
+		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(
@@ -78,8 +80,9 @@ public class FeedMenuHandler {
 			context.startActivity(new Intent(Intent.ACTION_VIEW, uri));
 			break;
 		case R.id.support_item:
-			new FlattrClickWorker(context, selectedFeed.getPaymentLink())
-					.executeAsync();
+			selectedFeed.getFlattrStatus().setFlattrQueue();
+			DBWriter.setFlattredStatus(context, selectedFeed);
+			new FlattrClickWorker(context).executeAsync();
 			break;
 		case R.id.share_link_item:
 			ShareUtils.shareFeedlink(context, selectedFeed);