Merge pull request #1046 from TomHennen/fix935

Remove Flattr this App button

2 files changed, 1 insertions, 54 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
index 96a6c2ba1..12b9a7db5 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
@@ -274,11 +274,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
     public void setContentEncoded(String contentEncoded) {
         this.contentEncoded = contentEncoded;
     }
-
-    public void setFlattrStatus(FlattrStatus status) {
-        this.flattrStatus = status;
-    }
-
+    
     public FlattrStatus getFlattrStatus() {
         return flattrStatus;
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java
index 50792ae26..3b9e6120c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/flattr/FlattrUtils.java
@@ -42,12 +42,6 @@ public class FlattrUtils {
 
     private static final String PREF_ACCESS_TOKEN = "de.danoeh.antennapod.preference.flattrAccessToken";
 
-    // Flattr URL for this app.
-    public static final String APP_URL = "http://antennapod.com";
-    // 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() {
@@ -110,18 +104,6 @@ public class FlattrUtils {
         storeToken(null);
     }
 
-    public static Thing getAppThing(Context context) {
-        FlattrService fs = FlattrServiceCreator.getService(retrieveToken());
-        try {
-            Thing thing = fs.getThing(Thing.withId(APP_THING_ID));
-            return thing;
-        } catch (FlattrException e) {
-            e.printStackTrace();
-            showErrorDialog(context, e.getMessage());
-            return null;
-        }
-    }
-
     public static void clickUrl(Context context, String url)
             throws FlattrException {
         if (hasToken()) {
@@ -245,37 +227,6 @@ public class FlattrUtils {
         }
     }
 
-    public static void showForbiddenDialog(final Context context,
-                                           final String url) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setTitle(R.string.action_forbidden_title);
-        builder.setMessage(R.string.action_forbidden_msg);
-        builder.setPositiveButton(R.string.authenticate_now_label,
-                new OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        context.startActivity(
-                                ClientConfig.flattrCallbacks.getFlattrAuthenticationActivityIntent(context));
-                    }
-
-                }
-        );
-        builder.setNegativeButton(R.string.visit_website_label,
-                new OnClickListener() {
-
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        Uri uri = Uri.parse(url);
-                        context.startActivity(new Intent(Intent.ACTION_VIEW,
-                                uri));
-                    }
-
-                }
-        );
-        builder.create().show();
-    }
-
     public static void showErrorDialog(final Context context, final String msg) {
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
         builder.setTitle(R.string.error_label);