diff --git a/oeffi/build.gradle b/oeffi/build.gradle index 1edc6a5..9ee287c 100644 --- a/oeffi/build.gradle +++ b/oeffi/build.gradle @@ -10,7 +10,6 @@ configurations { dependencies { compile project(':enabler') - compile 'de.schildbach.wallet:integration-android:2.0' compile 'com.android.support:support-annotations:27.1.1' compile 'com.android.support:support-compat:27.1.1' compile 'com.android.support:support-core-ui:27.1.1' diff --git a/oeffi/res/drawable-anydpi/ic_cash_multiple_grey600_24dp.xml b/oeffi/res/drawable-anydpi/ic_cash_multiple_grey600_24dp.xml deleted file mode 100644 index 3465ebe..0000000 --- a/oeffi/res/drawable-anydpi/ic_cash_multiple_grey600_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/oeffi/res/menu/donate_menu.xml b/oeffi/res/menu/donate_menu.xml deleted file mode 100644 index c581ae0..0000000 --- a/oeffi/res/menu/donate_menu.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/oeffi/res/menu/global_options.xml b/oeffi/res/menu/global_options.xml index 01c7657..a57c222 100644 --- a/oeffi/res/menu/global_options.xml +++ b/oeffi/res/menu/global_options.xml @@ -26,10 +26,5 @@ android:icon="@drawable/ic_info_outline_grey600_24dp" android:orderInCategory="999" android:title="@string/global_options_about_title"/> - \ No newline at end of file diff --git a/oeffi/res/values-de/strings.xml b/oeffi/res/values-de/strings.xml index f05e545..21fc49a 100644 --- a/oeffi/res/values-de/strings.xml +++ b/oeffi/res/values-de/strings.xml @@ -29,7 +29,6 @@ Für den groben Überblick Einstellungen Über Öffi - Spenden Allgemein @@ -60,13 +59,6 @@ Feedback geben. Google+ Community Diskussionen über die App. - Spenden - Bitcoins spenden - Bitcoin ist eine Internet-Währung. - Über Flattr spenden - Flattr ist ein Mikro-Spenden-System. - Euros spenden - https://oeffi.schildbach.de/donate_de.html Da du Öffi das erste Mal nutzt, musst Du die Region wählen die am besten passt. Du kannst das später ändern. diff --git a/oeffi/res/values/strings.xml b/oeffi/res/values/strings.xml index 25af249..8584c3a 100644 --- a/oeffi/res/values/strings.xml +++ b/oeffi/res/values/strings.xml @@ -29,7 +29,6 @@ For a rough overview Preferences About Offi - Donate Common @@ -60,13 +59,6 @@ Give feedback. Google+ Community Discussions about the app. - Donations - Donate Bitcoins - Bitcoin is an Internet currency. - Donate via Flattr - Flattr is a microdonation system. - Donate Euros - https://oeffi.schildbach.de/donate.html Because you are using Offi for the first time, you need to pick a region that suits you well. You diff --git a/oeffi/res/xml/about.xml b/oeffi/res/xml/about.xml index b2755b2..447af6c 100644 --- a/oeffi/res/xml/about.xml +++ b/oeffi/res/xml/about.xml @@ -51,21 +51,5 @@ android:summary="\@oeffi" android:title="Twitter" /> - - - - - diff --git a/oeffi/src/de/schildbach/oeffi/AboutActivity.java b/oeffi/src/de/schildbach/oeffi/AboutActivity.java index 4851af5..4043818 100644 --- a/oeffi/src/de/schildbach/oeffi/AboutActivity.java +++ b/oeffi/src/de/schildbach/oeffi/AboutActivity.java @@ -19,7 +19,6 @@ package de.schildbach.oeffi; import de.schildbach.oeffi.util.ChangelogDialogBuilder; import de.schildbach.oeffi.util.ErrorReporter; -import de.schildbach.wallet.integration.android.BitcoinIntegration; import android.content.Intent; import android.net.Uri; @@ -35,9 +34,6 @@ public class AboutActivity extends PreferenceActivity { private static final String KEY_ABOUT_FAQ = "about_faq"; private static final String KEY_ABOUT_REPORT_BUG = "about_report_bug"; private static final String KEY_ABOUT_COMMUNITY_GOOGLEPLUS = "about_community_googleplus"; - 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"; @Override @@ -73,15 +69,6 @@ public class AboutActivity extends PreferenceActivity { } else if (KEY_ABOUT_COMMUNITY_GOOGLEPLUS.equals(key)) { startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Constants.COMMUNITY_GOOGLEPLUS_URL))); finish(); - } 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(); } else if (KEY_ABOUT_MARKET_APP.equals(key)) { startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(String.format(Constants.MARKET_APP_URL, getPackageName())))); diff --git a/oeffi/src/de/schildbach/oeffi/Constants.java b/oeffi/src/de/schildbach/oeffi/Constants.java index 72237a8..c36d355 100644 --- a/oeffi/src/de/schildbach/oeffi/Constants.java +++ b/oeffi/src/de/schildbach/oeffi/Constants.java @@ -34,11 +34,9 @@ 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 COMMUNITY_GOOGLEPLUS_URL = "https://plus.google.com/communities/107613937661687598579"; - public static final String BITCOIN_ADDRESS = "1PW21MuBgPnjfUQriwK7TnRADFotEhdysr"; public static final long LOCATION_UPDATE_FREQ_MS = 10 * DateUtils.SECOND_IN_MILLIS; public static final int LOCATION_UPDATE_DISTANCE = 3; diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java index 97bb7cf..9c15640 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java @@ -57,7 +57,6 @@ import de.schildbach.oeffi.util.ErrorReporter; import de.schildbach.oeffi.util.NavigationMenuAdapter; import de.schildbach.oeffi.util.UiThreadExecutor; import de.schildbach.pte.NetworkId; -import de.schildbach.wallet.integration.android.BitcoinIntegration; import android.animation.AnimatorInflater; import android.animation.AnimatorSet; @@ -82,7 +81,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; -import android.widget.PopupMenu; import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; @@ -333,30 +331,6 @@ public abstract class OeffiMainActivity extends OeffiActivity { startActivity(new Intent(this, AboutActivity.class)); return true; } - - case R.id.global_options_donate: { - final PopupMenu popup = new PopupMenu(this, getMyActionBar()); - popup.inflate(R.menu.donate_menu); - popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { - public boolean onMenuItemClick(final MenuItem item) { - 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)))); - return true; - } else { - return false; - } - } - }); - popup.show(); - return true; - } } return false;