Merge branch 'flattr_queue_autoflattr' into develop (#331)

Other changes:
- Changed FlattrStatusFetcher into Thread-subclass
- Changed auto-flattr mechanism so that it's compatible with the updated PlaybackService
- Changed a couple of strings

Conflicts:
	src/de/danoeh/antennapod/storage/DBReader.java
	src/de/danoeh/antennapod/storage/DBWriter.java
	src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
	src/instrumentationTest/de/test/antennapod/storage/DBReaderTest.java

1 files changed, 14 insertions, 2 deletions

diff --git a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
index 60589bdf5..4aae2b091 100644
--- a/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
+++ b/src/de/danoeh/antennapod/activity/MediaplayerActivity.java
@@ -21,14 +21,18 @@ import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.asynctask.FlattrClickWorker;
 import de.danoeh.antennapod.dialog.TimeDialog;
+import de.danoeh.antennapod.feed.FeedItem;
+import de.danoeh.antennapod.feed.FeedMedia;
 import de.danoeh.antennapod.preferences.UserPreferences;
 import de.danoeh.antennapod.service.playback.PlaybackService;
 import de.danoeh.antennapod.util.Converter;
 import de.danoeh.antennapod.util.ShareUtils;
 import de.danoeh.antennapod.util.StorageUtils;
+import de.danoeh.antennapod.util.flattr.FlattrStatus;
 import de.danoeh.antennapod.util.playback.MediaPlayerError;
 import de.danoeh.antennapod.util.playback.Playable;
 import de.danoeh.antennapod.util.playback.PlaybackController;
+import de.danoeh.antennapod.storage.DBWriter;
 
 /**
  * Provides general features which are both needed for playing audio and video
@@ -313,8 +317,16 @@ public abstract class MediaplayerActivity extends ActionBarActivity
 				startActivity(new Intent(Intent.ACTION_VIEW, uri));
 				break;
 			case R.id.support_item:
-				new FlattrClickWorker(this, media.getPaymentLink())
-						.executeAsync();
+				try {
+					FeedItem feedItem = ((FeedMedia) media).getItem();
+					feedItem.getFlattrStatus().setFlattrQueue();
+
+                    DBWriter.setFeedItem(this, feedItem);
+					new FlattrClickWorker(this).executeAsync();
+				} 
+				catch (ClassCastException e) {
+					Log.d(TAG, "Could not flattr item - most likely external media: " + e.toString());
+				}
 				break;
 			case R.id.share_link_item:
 				ShareUtils.shareLink(this, media.getWebsiteLink());