FlattrClickWorker is now showing a progress dialog

2 files changed, 20 insertions, 1 deletions

diff --git a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
index 6bfb46451..195a25b02 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
+++ b/src/de/danoeh/antennapod/asynctask/FlattrClickWorker.java
@@ -1,9 +1,9 @@
 package de.danoeh.antennapod.asynctask;
 
 import org.shredzone.flattr4j.exception.FlattrException;
-import org.shredzone.flattr4j.oauth.AccessToken;
 
 import android.annotation.SuppressLint;
+import android.app.ProgressDialog;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
@@ -18,6 +18,7 @@ public class FlattrClickWorker extends AsyncTask<Void, Void, Void> {
 	protected String url;
 	protected String errorMsg;
 	protected int exitCode;
+	protected ProgressDialog progDialog;
 
 	protected final static int SUCCESS = 0;
 	protected final static int NO_TOKEN = 1;
@@ -50,9 +51,20 @@ public class FlattrClickWorker extends AsyncTask<Void, Void, Void> {
 		toast.show();
 	}
 
+	protected void onSetupProgDialog() {
+		progDialog = new ProgressDialog(context);
+		progDialog.setMessage(context.getString(R.string.flattring_label));
+		progDialog.setIndeterminate(true);
+		progDialog.setCancelable(false);
+		progDialog.show();
+	}
+
 	@Override
 	protected void onPostExecute(Void result) {
 		Log.d(TAG, "Exit code was " + exitCode);
+		if (progDialog != null) {
+			progDialog.dismiss();
+		}
 		switch (exitCode) {
 		case NO_TOKEN:
 			onNoAccessToken();
@@ -67,6 +79,11 @@ public class FlattrClickWorker extends AsyncTask<Void, Void, Void> {
 	}
 
 	@Override
+	protected void onPreExecute() {
+		onSetupProgDialog();
+	}
+
+	@Override
 	protected Void doInBackground(Void... params) {
 		Log.d(TAG, "Starting background work");
 		if (FlattrUtils.hasToken()) {
diff --git a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java b/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
index 86928c901..5c6797c71 100644
--- a/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
+++ b/src/de/danoeh/antennapod/asynctask/FlattrTokenFetcher.java
@@ -4,6 +4,7 @@ import org.shredzone.flattr4j.exception.FlattrException;
 import org.shredzone.flattr4j.oauth.AccessToken;
 import org.shredzone.flattr4j.oauth.AndroidAuthenticator;
 
+import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.net.Uri;
@@ -79,6 +80,7 @@ public class FlattrTokenFetcher extends AsyncTask<Void, Void, AccessToken> {
 		}
 	}
 
+	@SuppressLint("NewApi")
 	public void executeAsync() {
 		if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
 			executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);