Merge pull request #3266 from ByteHamster/remove-flattr

Removed Flattr support

3 files changed, 0 insertions, 76 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/FlattrPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/FlattrPreferencesFragment.java
deleted file mode 100644
index 152c3da87..000000000
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/FlattrPreferencesFragment.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package de.danoeh.antennapod.fragment.preferences;
-
-import android.os.Bundle;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.core.preferences.UserPreferences;
-import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
-import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog;
-
-public class FlattrPreferencesFragment extends PreferenceFragmentCompat {
-    private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate";
-    private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess";
-    private static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs";
-
-    @Override
-    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        addPreferencesFromResource(R.xml.preferences_flattr);
-        setupFlattrScreen();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        checkFlattrItemVisibility();
-    }
-
-    private void setupFlattrScreen() {
-        findPreference(PREF_FLATTR_REVOKE).setOnPreferenceClickListener(
-                preference -> {
-                    FlattrUtils.revokeAccessToken(getActivity());
-                    checkFlattrItemVisibility();
-                    return true;
-                }
-        );
-
-        findPreference(PREF_AUTO_FLATTR_PREFS)
-                .setOnPreferenceClickListener(preference -> {
-                    AutoFlattrPreferenceDialog.newAutoFlattrPreferenceDialog(getActivity(),
-                            new AutoFlattrPreferenceDialog.AutoFlattrPreferenceDialogInterface() {
-                                @Override
-                                public void onCancelled() {
-
-                                }
-
-                                @Override
-                                public void onConfirmed(boolean autoFlattrEnabled, float autoFlattrValue) {
-                                    UserPreferences.setAutoFlattrSettings(autoFlattrEnabled, autoFlattrValue);
-                                    checkFlattrItemVisibility();
-                                }
-                            });
-                    return true;
-                });
-    }
-
-    private void checkFlattrItemVisibility() {
-        boolean hasFlattrToken = FlattrUtils.hasToken();
-        findPreference(PREF_FLATTR_AUTH).setEnabled(!hasFlattrToken);
-        findPreference(PREF_FLATTR_REVOKE).setEnabled(hasFlattrToken);
-        findPreference(PREF_AUTO_FLATTR_PREFS).setEnabled(hasFlattrToken);
-    }
-}
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/IntegrationsPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/IntegrationsPreferencesFragment.java
index 805d84215..229274b76 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/IntegrationsPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/IntegrationsPreferencesFragment.java
@@ -4,10 +4,8 @@ import android.os.Bundle;
 import android.support.v7.preference.PreferenceFragmentCompat;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.PreferenceActivity;
-import de.danoeh.antennapod.core.util.flattr.FlattrUtils;
 
 public class IntegrationsPreferencesFragment extends PreferenceFragmentCompat {
-    private static final String PREF_SCREEN_FLATTR = "prefFlattrSettings";
     private static final String PREF_SCREEN_GPODDER = "prefGpodderSettings";
 
     @Override
@@ -17,19 +15,9 @@ public class IntegrationsPreferencesFragment extends PreferenceFragmentCompat {
     }
 
     private void setupIntegrationsScreen() {
-        findPreference(PREF_SCREEN_FLATTR).setOnPreferenceClickListener(preference -> {
-            ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_flattr);
-            return true;
-        });
         findPreference(PREF_SCREEN_GPODDER).setOnPreferenceClickListener(preference -> {
             ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_gpodder);
             return true;
         });
     }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        findPreference(PREF_SCREEN_FLATTR).setEnabled(FlattrUtils.hasAPICredentials());
-    }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java
index 5a4866206..701d21ce0 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java
@@ -143,8 +143,5 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat {
         config.index(R.xml.preferences_gpodder)
                 .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_integrations))
                 .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_gpodder));
-        config.index(R.xml.preferences_flattr)
-                .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_integrations))
-                .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_flattr));
     }
 }