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, 8 insertions, 0 deletions

diff --git a/src/de/danoeh/antennapod/storage/DBTasks.java b/src/de/danoeh/antennapod/storage/DBTasks.java
index 3b6ab99ce..c6a0dad17 100644
--- a/src/de/danoeh/antennapod/storage/DBTasks.java
+++ b/src/de/danoeh/antennapod/storage/DBTasks.java
@@ -4,6 +4,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.util.Log;
+import de.danoeh.antennapod.asynctask.FlattrClickWorker;
+import de.danoeh.antennapod.asynctask.FlattrStatusFetcher;
 import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.feed.*;
 import de.danoeh.antennapod.preferences.UserPreferences;
@@ -151,6 +153,12 @@ public final class DBTasks {
                     }
                     isRefreshing.set(false);
 
+                    if (AppConfig.DEBUG) Log.d(TAG, "Flattring all pending things.");
+                    new FlattrClickWorker(context, FlattrClickWorker.FLATTR_NOTIFICATION).executeSync(); // flattr pending things
+
+                    if (AppConfig.DEBUG) Log.d(TAG, "Fetching flattr status.");
+                    new FlattrStatusFetcher(context).start();
+
                     GpodnetSyncService.sendSyncIntent(context);
                     autodownloadUndownloadedItems(context);
                 }