From b8778255baaf5a3fc7b91cb53472820bddcf6223 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Fri, 6 Sep 2019 16:53:13 +0200
Subject: [PATCH] Remove Flattr from donation options.

---
 oeffi/res/menu/donate_menu.xml                       | 4 ----
 oeffi/res/values-de/strings.xml                      | 2 --
 oeffi/res/values/strings.xml                         | 2 --
 oeffi/res/xml/about.xml                              | 4 ----
 oeffi/src/de/schildbach/oeffi/AboutActivity.java     | 4 ----
 oeffi/src/de/schildbach/oeffi/Constants.java         | 1 -
 oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java | 3 ---
 7 files changed, 20 deletions(-)

diff --git a/oeffi/res/menu/donate_menu.xml b/oeffi/res/menu/donate_menu.xml
index 1e8516a..4cd2b6a 100644
--- a/oeffi/res/menu/donate_menu.xml
+++ b/oeffi/res/menu/donate_menu.xml
@@ -5,10 +5,6 @@
         android:id="@+id/donate_menu_bitcoin"
         android:title="@string/about_donate_bitcoin_title"
         android:titleCondensed="@string/about_donate_bitcoin_summary"/>
-    <item
-        android:id="@+id/donate_menu_flattr"
-        android:title="@string/about_donate_flattr_title"
-        android:titleCondensed="@string/about_donate_flattr_summary"/>
     <item
         android:id="@+id/donate_menu_euro"
         android:title="@string/about_donate_euro_title"
diff --git a/oeffi/res/values-de/strings.xml b/oeffi/res/values-de/strings.xml
index 6dc16b2..cbfa1e3 100644
--- a/oeffi/res/values-de/strings.xml
+++ b/oeffi/res/values-de/strings.xml
@@ -60,8 +60,6 @@
     <string name="about_donate_title">Spenden</string>
     <string name="about_donate_bitcoin_title">Bitcoins spenden</string>
     <string name="about_donate_bitcoin_summary">Bitcoin ist eine Internet-Währung.</string>
-    <string name="about_donate_flattr_title">Über Flattr spenden</string>
-    <string name="about_donate_flattr_summary">Flattr ist ein Mikro-Spenden-System.</string>
     <string name="about_donate_euro_title">Euros spenden</string>
     <string name="about_donate_euro_summary">https://oeffi.schildbach.de/donate_de.html</string>
 
diff --git a/oeffi/res/values/strings.xml b/oeffi/res/values/strings.xml
index 1c9f4c1..8e437f2 100644
--- a/oeffi/res/values/strings.xml
+++ b/oeffi/res/values/strings.xml
@@ -60,8 +60,6 @@
     <string name="about_donate_title">Donations</string>
     <string name="about_donate_bitcoin_title">Donate Bitcoins</string>
     <string name="about_donate_bitcoin_summary">Bitcoin is an Internet currency.</string>
-    <string name="about_donate_flattr_title">Donate via Flattr</string>
-    <string name="about_donate_flattr_summary">Flattr is a microdonation system.</string>
     <string name="about_donate_euro_title">Donate Euros</string>
     <string name="about_donate_euro_summary">https://oeffi.schildbach.de/donate.html</string>
 
diff --git a/oeffi/res/xml/about.xml b/oeffi/res/xml/about.xml
index e67c2a8..607c119 100644
--- a/oeffi/res/xml/about.xml
+++ b/oeffi/res/xml/about.xml
@@ -50,10 +50,6 @@
             android:key="about_donate_bitcoin"
             android:summary="@string/about_donate_bitcoin_summary"
             android:title="@string/about_donate_bitcoin_title" />
-        <Preference
-            android:key="about_donate_flattr"
-            android:summary="@string/about_donate_flattr_summary"
-            android:title="@string/about_donate_flattr_title" />
         <Preference
             android:key="about_donate_euro"
             android:summary="@string/about_donate_euro_summary"
diff --git a/oeffi/src/de/schildbach/oeffi/AboutActivity.java b/oeffi/src/de/schildbach/oeffi/AboutActivity.java
index 6bdd33b..22b3120 100644
--- a/oeffi/src/de/schildbach/oeffi/AboutActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/AboutActivity.java
@@ -33,7 +33,6 @@ public class AboutActivity extends PreferenceActivity {
     private static final String KEY_ABOUT_CHANGELOG = "about_changelog";
     private static final String KEY_ABOUT_FAQ = "about_faq";
     private static final String KEY_ABOUT_DONATE_BITCOIN = "about_donate_bitcoin";
-    private static final String KEY_ABOUT_DONATE_FLATTR = "about_donate_flattr";
     private static final String KEY_ABOUT_DONATE_EURO = "about_donate_euro";
     private static final String KEY_ABOUT_MARKET_APP = "about_market_rate";
 
@@ -67,9 +66,6 @@ public class AboutActivity extends PreferenceActivity {
         } else if (KEY_ABOUT_DONATE_BITCOIN.equals(key)) {
             BitcoinIntegration.request(this, Constants.BITCOIN_ADDRESS);
             finish();
-        } else if (KEY_ABOUT_DONATE_FLATTR.equals(key)) {
-            startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.FLATTR_THING_URL)));
-            finish();
         } else if (KEY_ABOUT_DONATE_EURO.equals(key)) {
             startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.about_donate_euro_summary))));
             finish();
diff --git a/oeffi/src/de/schildbach/oeffi/Constants.java b/oeffi/src/de/schildbach/oeffi/Constants.java
index b31a0fa..c0a4833 100644
--- a/oeffi/src/de/schildbach/oeffi/Constants.java
+++ b/oeffi/src/de/schildbach/oeffi/Constants.java
@@ -34,7 +34,6 @@ public class Constants {
     public static final String PLAN_STATIONS_FILENAME = "plans-stations.txt";
 
     public static final String TWITTER_URL = "http://twitter.com/oeffi";
-    public static final String FLATTR_THING_URL = "http://flattr.com/thing/36806";
     public static final String MARKET_APP_URL = "market://details?id=%s";
     public static final String GOOGLE_PLAY_APP_URL = "https://play.google.com/store/apps/details?id=%s";
     public static final String BITCOIN_ADDRESS = "1PW21MuBgPnjfUQriwK7TnRADFotEhdysr";
diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
index 82af13e..97eb05f 100644
--- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
+++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
@@ -332,9 +332,6 @@ public abstract class OeffiMainActivity extends OeffiActivity {
                     if (item.getItemId() == R.id.donate_menu_bitcoin) {
                         BitcoinIntegration.request(OeffiMainActivity.this, Constants.BITCOIN_ADDRESS);
                         return true;
-                    } else if (item.getItemId() == R.id.donate_menu_flattr) {
-                        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.FLATTR_THING_URL)));
-                        return true;
                     } else if (item.getItemId() == R.id.donate_menu_euro) {
                         startActivity(new Intent(Intent.ACTION_VIEW,
                                 Uri.parse(getString(R.string.about_donate_euro_summary))));