diff --git a/oeffi/src-aosp/de/schildbach/oeffi/Variants.java b/oeffi/src-aosp/de/schildbach/oeffi/Variants.java index 8f26f91..0fbc2a1 100644 --- a/oeffi/src-aosp/de/schildbach/oeffi/Variants.java +++ b/oeffi/src-aosp/de/schildbach/oeffi/Variants.java @@ -18,5 +18,4 @@ package de.schildbach.oeffi; public class Variants { - public static final boolean ENABLE_DONATE = true; } diff --git a/oeffi/src-google/de/schildbach/oeffi/Variants.java b/oeffi/src-google/de/schildbach/oeffi/Variants.java index 3fe9f90..0fbc2a1 100644 --- a/oeffi/src-google/de/schildbach/oeffi/Variants.java +++ b/oeffi/src-google/de/schildbach/oeffi/Variants.java @@ -18,5 +18,4 @@ package de.schildbach.oeffi; public class Variants { - public static final boolean ENABLE_DONATE = false; } diff --git a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java index fbab782..8a648ac 100644 --- a/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java +++ b/oeffi/src/de/schildbach/oeffi/OeffiMainActivity.java @@ -130,8 +130,6 @@ public abstract class OeffiMainActivity extends OeffiActivity { directionsItem.setChecked(OeffiMainActivity.this instanceof DirectionsActivity); final MenuItem plansItem = menu.findItem(R.id.global_options_plans); plansItem.setChecked(OeffiMainActivity.this instanceof PlansPickerActivity); - final MenuItem donateItem = menu.findItem(R.id.global_options_donate); - donateItem.setVisible(Variants.ENABLE_DONATE); } @Override @@ -174,8 +172,7 @@ public abstract class OeffiMainActivity extends OeffiActivity { } case R.id.global_options_donate: { - if (Variants.ENABLE_DONATE) - PreferenceActivity.start(OeffiMainActivity.this, DonateFragment.class.getName()); + PreferenceActivity.start(OeffiMainActivity.this, DonateFragment.class.getName()); return true; } diff --git a/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java b/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java index ff08703..182a1c0 100644 --- a/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java +++ b/oeffi/src/de/schildbach/oeffi/preference/PreferenceActivity.java @@ -21,7 +21,6 @@ import android.app.Activity; import android.content.Intent; import android.view.MenuItem; import de.schildbach.oeffi.R; -import de.schildbach.oeffi.Variants; import java.util.List; @@ -39,8 +38,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { @Override public void onBuildHeaders(final List
target) { loadHeadersFromResource(R.xml.preference_headers, target); - if (Variants.ENABLE_DONATE) - loadHeadersFromResource(R.xml.preference_headers_donate, target); + loadHeadersFromResource(R.xml.preference_headers_donate, target); } @Override @@ -59,6 +57,6 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { return CommonFragment.class.getName().equals(fragmentName) || DirectionsFragment.class.getName().equals(fragmentName) || AboutFragment.class.getName().equals(fragmentName) - || (Variants.ENABLE_DONATE && DonateFragment.class.getName().equals(fragmentName)); + || DonateFragment.class.getName().equals(fragmentName); } }