From e5b37b463c273389e9c9a8568f71b02610a7a178 Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sun, 22 Jul 2012 16:48:18 +0200
Subject: Bugfixes

---
 src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java  | 1 +
 src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java | 5 +++--
 src/de/danoeh/antennapod/util/FlattrServiceCreator.java    | 7 +------
 src/de/danoeh/antennapod/util/FlattrUtils.java             | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/de/danoeh/antennapod')

diff --git a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
index 8655c69fb..b992f74f8 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
+++ b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
@@ -103,6 +103,7 @@ public class FlattrClickWorker extends AsyncTask<Void, Void, Void> {
 
 	@SuppressLint("NewApi")
 	public void executeAsync() {
+		FlattrUtils.hasToken();
 		if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
 			executeOnExecutor(THREAD_POOL_EXECUTOR);
 		} else {
diff --git a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java b/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
index 61f7bfe08..d3c1d73c6 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
+++ b/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
@@ -34,7 +34,9 @@ public class FlattrTokenFetcher extends AsyncTask<Void, Void, AccessToken> {
 
 	@Override
 	protected void onPostExecute(AccessToken result) {
-		super.onPostExecute(result);
+		if (result != null) {
+			FlattrUtils.storeToken(result);
+		}
 		dialog.dismiss();
 		if (exception == null) {
 			FlattrAuthActivity instance = FlattrAuthActivity.getInstance();
@@ -73,7 +75,6 @@ public class FlattrTokenFetcher extends AsyncTask<Void, Void, AccessToken> {
 		}
 		if (token != null) {
 			if (AppConfig.DEBUG) Log.d(TAG, "Successfully got token");
-			FlattrUtils.storeToken(token);
 			return token;
 		} else {
 			Log.w(TAG, "Flattr token was null");
diff --git a/src/de/danoeh/antennapod/util/FlattrServiceCreator.java b/src/de/danoeh/antennapod/util/FlattrServiceCreator.java
index 9602df53c..1eb1635b9 100644
--- a/src/de/danoeh/antennapod/util/FlattrServiceCreator.java
+++ b/src/de/danoeh/antennapod/util/FlattrServiceCreator.java
@@ -15,12 +15,7 @@ public class FlattrServiceCreator {
 	private static volatile FlattrService flattrService;
 	
 	public static FlattrService getService(AccessToken token) {
-		if (flattrService == null) {
-			if (AppConfig.DEBUG) Log.d(TAG, "Creating new instance of Flattr Service");
-			FlattrFactory factory = FlattrFactory.getInstance();
-			flattrService = factory.createFlattrService(token);
-		}
-		return flattrService;
+		return FlattrFactory.getInstance().createFlattrService(token);
 	}
 	
 	public static void deleteFlattrService() {
diff --git a/src/de/danoeh/antennapod/util/FlattrUtils.java b/src/de/danoeh/antennapod/util/FlattrUtils.java
index 1c77b7fc4..3256a7f29 100644
--- a/src/de/danoeh/antennapod/util/FlattrUtils.java
+++ b/src/de/danoeh/antennapod/util/FlattrUtils.java
@@ -96,7 +96,7 @@ public class FlattrUtils {
 			editor.putString(PREF_ACCESS_TOKEN, null);
 		}
 		editor.commit();
-		cachedToken = null;
+		cachedToken = token;
 	}
 
 	public static void deleteToken() {
-- 
cgit v1.2.3