* directly update Feed/FeedItem FlattrStatus instead of writing back entire Feed/FeedItem to database

* fix race condition when fetching FlattrStatus
* fix missing copy of Flattr status in Feed.updateFromOther()
* fix feed reading from db, was missing FlattrStatus

followup on #331

1 files changed, 15 insertions, 2 deletions

diff --git a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
index 1335e7bf7..fa0b0bb3d 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
+++ b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.concurrent.Executor;
 
 import org.shredzone.flattr4j.exception.FlattrException;
 import org.shredzone.flattr4j.model.Flattr;
@@ -223,10 +224,10 @@ public class FlattrClickWorker extends AsyncTask<Void, String, Void> {
 
 					FlattrUtils.clickUrl(context, thing.getPaymentLink());
 					flattrd.add(thing.getTitle());
-					
+
 					thing.getFlattrStatus().setFlattred();
 				}
-				catch (FlattrException e) {
+				catch (Exception e) {
 					Log.d(TAG, "flattrQueue processing exception at item " + thing.getTitle() + " "  + e.getMessage());
 					flattr_failed.ensureCapacity(flattrList.size());
 					flattr_failed.add(thing.getTitle());
@@ -256,4 +257,16 @@ public class FlattrClickWorker extends AsyncTask<Void, String, Void> {
 		}
 	}
 
+    public void executeSync() {
+        class DirectExecutor implements Executor {
+            public void execute(Runnable r) {
+                 r.run();
+            }
+        }
+        FlattrUtils.hasToken();
+        executeOnExecutor(new DirectExecutor());
+
+    }
+
+
 }