diff options
Diffstat (limited to 'src/de/danoeh/antennapod/util')
4 files changed, 23 insertions, 30 deletions
diff --git a/src/de/danoeh/antennapod/util/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/FeedItemMenuHandler.java index 5c5fe452b..c8c6d9eb3 100644 --- a/src/de/danoeh/antennapod/util/FeedItemMenuHandler.java +++ b/src/de/danoeh/antennapod/util/FeedItemMenuHandler.java @@ -9,7 +9,6 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.asynctask.FlattrClickWorker; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedManager; import de.danoeh.antennapod.storage.DownloadRequester; @@ -103,7 +102,8 @@ public class FeedItemMenuHandler { context.startActivity(new Intent(Intent.ACTION_VIEW, uri)); break; case R.id.support_item: - new FlattrClickWorker(context, selectedItem.getPaymentLink()).executeAsync(); + Uri supportUri = Uri.parse(selectedItem.getPaymentLink()); + context.startActivity(new Intent(Intent.ACTION_VIEW, supportUri)); break; case R.id.share_link_item: ShareUtils.shareFeedItemLink(context, selectedItem); diff --git a/src/de/danoeh/antennapod/util/FeedMenuHandler.java b/src/de/danoeh/antennapod/util/FeedMenuHandler.java index 31d3febdf..2c24c973c 100644 --- a/src/de/danoeh/antennapod/util/FeedMenuHandler.java +++ b/src/de/danoeh/antennapod/util/FeedMenuHandler.java @@ -11,7 +11,6 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; import de.danoeh.antennapod.activity.FeedInfoActivity; -import de.danoeh.antennapod.asynctask.FlattrClickWorker; import de.danoeh.antennapod.feed.Feed; import de.danoeh.antennapod.feed.FeedItem; import de.danoeh.antennapod.feed.FeedManager; @@ -30,7 +29,8 @@ public class FeedMenuHandler { } public static boolean onPrepareOptionsMenu(Menu menu, Feed selectedFeed) { - if (AppConfig.DEBUG) Log.d(TAG, "Preparing options menu"); + if (AppConfig.DEBUG) + Log.d(TAG, "Preparing options menu"); if (selectedFeed.getPaymentLink() != null) { menu.findItem(R.id.support_item).setVisible(true); } @@ -42,9 +42,10 @@ public class FeedMenuHandler { } else { refresh.setVisible(true); } - - menu.findItem(R.id.share_link_item).setVisible(selectedFeed.getLink() != null); - + + menu.findItem(R.id.share_link_item).setVisible( + selectedFeed.getLink() != null); + return true; } @@ -70,7 +71,8 @@ public class FeedMenuHandler { context.startActivity(new Intent(Intent.ACTION_VIEW, uri)); break; case R.id.support_item: - new FlattrClickWorker(context, selectedFeed.getPaymentLink()).executeAsync(); + Uri supportUri = Uri.parse(selectedFeed.getPaymentLink()); + context.startActivity(new Intent(Intent.ACTION_VIEW, supportUri)); break; case R.id.share_link_item: ShareUtils.shareFeedlink(context, selectedFeed); diff --git a/src/de/danoeh/antennapod/util/FlattrServiceCreator.java b/src/de/danoeh/antennapod/util/FlattrServiceCreator.java index 1eb1635b9..99aaa82e8 100644 --- a/src/de/danoeh/antennapod/util/FlattrServiceCreator.java +++ b/src/de/danoeh/antennapod/util/FlattrServiceCreator.java @@ -1,3 +1,4 @@ +/* package de.danoeh.antennapod.util; import org.shredzone.flattr4j.FlattrFactory; @@ -7,8 +8,9 @@ import org.shredzone.flattr4j.oauth.AccessToken; import de.danoeh.antennapod.AppConfig; import android.util.Log; - +*/ /** Ensures that only one instance of the FlattrService class exists at a time */ +/* public class FlattrServiceCreator { public static final String TAG = "FlattrServiceCreator"; @@ -23,3 +25,5 @@ public class FlattrServiceCreator { flattrService = null; } } + +*/
\ No newline at end of file diff --git a/src/de/danoeh/antennapod/util/FlattrUtils.java b/src/de/danoeh/antennapod/util/FlattrUtils.java index 3256a7f29..b72d71ff1 100644 --- a/src/de/danoeh/antennapod/util/FlattrUtils.java +++ b/src/de/danoeh/antennapod/util/FlattrUtils.java @@ -2,14 +2,6 @@ package de.danoeh.antennapod.util; import java.util.EnumSet; -import org.shredzone.flattr4j.FlattrFactory; -import org.shredzone.flattr4j.FlattrService; -import org.shredzone.flattr4j.exception.FlattrException; -import org.shredzone.flattr4j.model.Thing; -import org.shredzone.flattr4j.oauth.AccessToken; -import org.shredzone.flattr4j.oauth.AndroidAuthenticator; -import org.shredzone.flattr4j.oauth.Scope; - import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.ProgressDialog; @@ -25,11 +17,11 @@ import android.util.Log; import android.widget.Toast; import de.danoeh.antennapod.AppConfig; import de.danoeh.antennapod.PodcastApp; -import de.danoeh.antennapod.activity.FlattrAuthActivity; -import de.danoeh.antennapod.asynctask.FlattrTokenFetcher; + import de.danoeh.antennapod.R; /** Utility methods for doing something with flattr. */ + public class FlattrUtils { private static final String TAG = "FlattrUtils"; @@ -39,12 +31,12 @@ public class FlattrUtils { private static final String PREF_ACCESS_TOKEN = "de.danoeh.antennapod.preference.flattrAccessToken"; - /** Flattr URL for this app. */ + // Flattr URL for this app. public static final String APP_URL = "http://antennapod.com"; - /** Human-readable flattr-page. */ + // Human-readable flattr-page. public static final String APP_LINK = "https://flattr.com/thing/745609/"; public static final String APP_THING_ID = "745609"; - +/* private static volatile AccessToken cachedToken; private static AndroidAuthenticator createAuthenticator() { @@ -58,10 +50,6 @@ public class FlattrUtils { context.startActivity(intent); } - /** - * Returns the access token from the preferences or null if no access token - * was saved before. - */ private static AccessToken retrieveToken() { if (cachedToken == null) { if (AppConfig.DEBUG) Log.d(TAG, "Retrieving access token"); @@ -80,12 +68,10 @@ public class FlattrUtils { } - /** Returns true if the application has saved an access token */ public static boolean hasToken() { return retrieveToken() != null; } - /** Stores the token as a preference */ public static void storeToken(AccessToken token) { if (AppConfig.DEBUG) Log.d(TAG, "Storing token"); SharedPreferences.Editor editor = PreferenceManager @@ -104,7 +90,6 @@ public class FlattrUtils { storeToken(null); } - /** Get the thing that represents this app */ public static Thing getAppThing(Context context) { FlattrService fs = FlattrServiceCreator.getService(retrieveToken()); try { @@ -226,5 +211,7 @@ public class FlattrUtils { }); builder.create().show(); } + */ + -} +}
\ No newline at end of file |