mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 20:48:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Flattr from donation options.

Browse source
This commit is contained in:
Andreas Schildbach 2019-09-06 16:53:13 +02:00
parent 5de2df19ac
commit b8778255ba
7 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oeffi/res/menu/donate_menu.xml
View file

@ -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"

2
oeffi/res/values-de/strings.xml
View file

@ -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>

2
oeffi/res/values/strings.xml
View file

@ -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>

4
oeffi/res/xml/about.xml
View file

@ -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"

4
oeffi/src/de/schildbach/oeffi/AboutActivity.java
View file

@ -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();

1
oeffi/src/de/schildbach/oeffi/Constants.java
View file

@ -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";

3
oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java
View file

@ -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))));