diff options
| author | blafoo <github@blafoo.de> | 2012-02-27 22:02:36 +0100 |
|---|---|---|
| committer | blafoo <github@blafoo.de> | 2012-02-27 22:03:43 +0100 |
| commit | 4cee87eb93e66e9f89750a17a7a03850a0c9e08b (patch) | |
| tree | 1e0f7c0f600de1c6dcc32a420c98daa18c360551 | |
| parent | 696af5ffbc08c8488caa325da34e04bea63ea1b5 (diff) | |
| download | cgeo-4cee87eb93e66e9f89750a17a7a03850a0c9e08b.zip cgeo-4cee87eb93e66e9f89750a17a7a03850a0c9e08b.tar.gz cgeo-4cee87eb93e66e9f89750a17a7a03850a0c9e08b.tar.bz2 | |
Captcha setting disabled for PMs. Closes #1177
| -rw-r--r-- | main/res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/Settings.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/cgeoinit.java | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml index c7a6ec8..0334488 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -392,7 +392,7 @@ <string name="init_other">Weitere Optionen</string> <string name="init_skin">Helle Oberfläche (Neustart erforderlich)</string> <string name="init_address">Position am Startbildschirm anzeigen</string> - <string name="init_captcha">Zeige CAPTCHA wenn notwendig</string> + <string name="init_captcha">Zeige CAPTCHA wenn notwendig (nur Basic Member)</string> <string name="init_useenglish">c:geo auf Englisch nutzen (Neustart erforderlich)</string> <string name="init_exclude">Eigene und gefundene Caches ausblenden</string> <string name="init_showwaypoints">Wegpunkte auf Live-Karte zeigen</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 4fe140c..2052dc8 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -392,7 +392,7 @@ <string name="init_other">Other Options</string> <string name="init_skin">Use light skin\n(Restart needed)</string> <string name="init_address">Show address on Mainscreen</string> - <string name="init_captcha">Show CAPTCHA if necessary</string> + <string name="init_captcha">Show CAPTCHA if necessary (only Basic Member)</string> <string name="init_useenglish">Use English language for c:geo\n(Restart needed)</string> <string name="init_exclude">Exclude own and found caches</string> <string name="init_showwaypoints">Show Waypoints on Live map</string> diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java index af1ad0a..600d344 100644 --- a/main/src/cgeo/geocaching/Settings.java +++ b/main/src/cgeo/geocaching/Settings.java @@ -491,7 +491,7 @@ public final class Settings { } public static boolean isShowCaptcha() { - return sharedPrefs.getBoolean(KEY_SHOW_CAPTCHA, false); + return isPremiumMember() ? false : sharedPrefs.getBoolean(KEY_SHOW_CAPTCHA, false); } public static void setShowCaptcha(final boolean showCaptcha) { diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java index 0839f46..ee48aec 100644 --- a/main/src/cgeo/geocaching/cgeoinit.java +++ b/main/src/cgeo/geocaching/cgeoinit.java @@ -393,6 +393,7 @@ public class cgeoinit extends AbstractActivity { }); final CheckBox captchaButton = (CheckBox) findViewById(R.id.captcha); + captchaButton.setEnabled(!Settings.isPremiumMember()); captchaButton.setChecked(Settings.isShowCaptcha()); captchaButton.setOnClickListener(new View.OnClickListener() { |