diff options
| author | Bananeweizen <Bananeweizen@gmx.de> | 2012-03-09 20:58:34 -0800 |
|---|---|---|
| committer | Bananeweizen <Bananeweizen@gmx.de> | 2012-03-09 20:58:34 -0800 |
| commit | 22aa3e5e9d3b3064c4831cd6b112e14cc0e6b1db (patch) | |
| tree | f75e38ab9bfd207293c34bdad2bc5d42530f1a6a | |
| parent | 95a7221a308ee4b8140a920d2434595c585c62e6 (diff) | |
| parent | 5ef62c82aae1fa83b57d8a2aba9bdf20303240a7 (diff) | |
| download | cgeo-22aa3e5e9d3b3064c4831cd6b112e14cc0e6b1db.zip cgeo-22aa3e5e9d3b3064c4831cd6b112e14cc0e6b1db.tar.gz cgeo-22aa3e5e9d3b3064c4831cd6b112e14cc0e6b1db.tar.bz2 | |
Merge pull request #1260 from blafoo/master
Don't load direction images for PMs. Fixes #227
| -rw-r--r-- | main/res/values-de/strings.xml | 2 | ||||
| -rwxr-xr-x | 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 229afde..e0de5d1 100644 --- a/main/res/values-de/strings.xml +++ b/main/res/values-de/strings.xml @@ -422,7 +422,7 @@ <string name="init_maptrail">Zeige Spur auf Karte</string> <string name="init_trackautovisit">Trackables automatisch auf \"besuchen\" setzen</string> <string name="init_sigautoinsert">Signatur automatisch einfügen</string> - <string name="init_loaddirectionimg">Richtungs-Grafik laden wenn nötig</string> + <string name="init_loaddirectionimg">Richtungs-Grafik laden wenn nötig (nur Basic Member)</string> <string name="init_default_navigation_tool">Standardnavigation</string> <string name="init_default_navigation_tool_description">Hier kannst du dein bevorzugtes Navigationswerkzeug festlegen.</string> <string name="init_default_navigation_tool_select">Wähle Werkzeug</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 8a33820..5b38e23 100755 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -423,7 +423,7 @@ <string name="init_maptrail">Show trail on Map</string> <string name="init_trackautovisit">Set trackables to \"Visited\" as a default</string> <string name="init_sigautoinsert">Insert signature automatically</string> - <string name="init_loaddirectionimg">Load direction-image if necessary</string> + <string name="init_loaddirectionimg">Load direction-image if necessary (only Basic Member)</string> <string name="init_default_navigation_tool">Default Navigation</string> <string name="init_default_navigation_tool_description">Here you can select your preferred navigation tool.</string> <string name="init_default_navigation_tool_select">Select tool</string> diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java index 7479227..8c34b54 100644 --- a/main/src/cgeo/geocaching/Settings.java +++ b/main/src/cgeo/geocaching/Settings.java @@ -415,7 +415,7 @@ public final class Settings { } public static boolean getLoadDirImg() { - return sharedPrefs.getBoolean(KEY_LOAD_DIRECTION_IMG, true); + return isPremiumMember() ? false : sharedPrefs.getBoolean(KEY_LOAD_DIRECTION_IMG, true); } static void setGcCustomDate(final String format) { diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java index 1a694bd..667dff1 100644 --- a/main/src/cgeo/geocaching/cgeoinit.java +++ b/main/src/cgeo/geocaching/cgeoinit.java @@ -404,6 +404,7 @@ public class cgeoinit extends AbstractActivity { }); final CheckBox dirImgButton = (CheckBox) findViewById(R.id.loaddirectionimg); + dirImgButton.setEnabled(!Settings.isPremiumMember()); dirImgButton.setChecked(Settings.getLoadDirImg()); dirImgButton.setOnClickListener(new View.OnClickListener() { |