Add separate settings for elevation and vote data

3 files changed, 38 insertions, 12 deletions

diff --git a/main/src/cgeo/geocaching/Settings.java b/main/src/cgeo/geocaching/Settings.java
index 6b7d7c4..4da2314 100644
--- a/main/src/cgeo/geocaching/Settings.java
+++ b/main/src/cgeo/geocaching/Settings.java
@@ -45,7 +45,8 @@ public final class Settings {
     private static final String KEY_TWITTER_TOKEN_PUBLIC = "tokenpublic";
     private static final String KEY_VERSION = "version";
     private static final String KEY_LOAD_DESCRIPTION = "autoloaddesc";
-    private static final String KEY_ADDITIONAL_DETAILS = "additionaldetails";
+    private static final String KEY_RATING_WANTED = "ratingwanted";
+    private static final String KEY_ELEVATION_WANTED = "elevationwanted";
     private static final String KEY_USE_ENGLISH = "useenglish";
     private static final String KEY_AS_BROWSER = "asbrowser";
     private static final String KEY_USE_COMPASS = "usecompass";
@@ -569,16 +570,30 @@ public final class Settings {
         });
     }
 
-    public static boolean isAdditionalDetails() {
-        return sharedPrefs.getBoolean(KEY_ADDITIONAL_DETAILS, true);
+    public static boolean isRatingWanted() {
+        return sharedPrefs.getBoolean(KEY_RATING_WANTED, true);
     }
 
-    public static void setAdditionalDetails(final boolean additionaldetails) {
+    public static void setRatingWanted(final boolean ratingWanted) {
         editSharedSettings(new PrefRunnable() {
 
             @Override
             public void edit(Editor edit) {
-                edit.putBoolean(KEY_ADDITIONAL_DETAILS, additionaldetails);
+                edit.putBoolean(KEY_RATING_WANTED, ratingWanted);
+            }
+        });
+    }
+
+    public static boolean isElevationWanted() {
+        return sharedPrefs.getBoolean(KEY_ELEVATION_WANTED, true);
+    }
+
+    public static void setElevationWanted(final boolean elevationWanted) {
+        editSharedSettings(new PrefRunnable() {
+
+            @Override
+            public void edit(Editor edit) {
+                edit.putBoolean(KEY_ELEVATION_WANTED, elevationWanted);
             }
         });
     }
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 0cff355..108b431 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -884,7 +884,7 @@ public class cgBase {
             }
         }
 
-        if (Settings.isAdditionalDetails()) {
+        if (Settings.isRatingWanted()) {
             // get ratings
             if (guids.size() > 0) {
                 Log.i(Settings.tag, "Trying to get ratings for " + cids.size() + " caches");
@@ -1441,8 +1441,7 @@ public class cgBase {
         sendLoadProgressDetail(handler, R.string.cache_dialog_loading_details_status_logs);
         loadLogsFromDetails(page, cache);
 
-        if (Settings.isAdditionalDetails()) {
-
+        if (Settings.isElevationWanted()) {
             if (CancellableHandler.isCancelled(handler)) {
                 return;
             }
@@ -1450,7 +1449,9 @@ public class cgBase {
             if (cache.coords != null) {
                 cache.elevation = getElevation(cache.coords);
             }
+        }
 
+        if (Settings.isRatingWanted()) {
             if (CancellableHandler.isCancelled(handler)) {
                 return;
             }
diff --git a/main/src/cgeo/geocaching/cgeoinit.java b/main/src/cgeo/geocaching/cgeoinit.java
index 34a7a14..8391f15 100644
--- a/main/src/cgeo/geocaching/cgeoinit.java
+++ b/main/src/cgeo/geocaching/cgeoinit.java
@@ -325,13 +325,23 @@ public class cgeoinit extends AbstractActivity {
             }
         });
 
-        final CheckBox additionalDetailsButton = (CheckBox) findViewById(R.id.additionaldetails);
-        additionalDetailsButton.setChecked(Settings.isAdditionalDetails());
-        additionalDetailsButton.setOnClickListener(new View.OnClickListener() {
+        final CheckBox ratingWantedButton = (CheckBox) findViewById(R.id.ratingwanted);
+        ratingWantedButton.setChecked(Settings.isRatingWanted());
+        ratingWantedButton.setOnClickListener(new View.OnClickListener() {
 
             @Override
             public void onClick(View v) {
-                Settings.setAdditionalDetails(additionalDetailsButton.isChecked());
+                Settings.setRatingWanted(ratingWantedButton.isChecked());
+            }
+        });
+
+        final CheckBox elevationWantedButton = (CheckBox) findViewById(R.id.elevationwanted);
+        elevationWantedButton.setChecked(Settings.isElevationWanted());
+        elevationWantedButton.setOnClickListener(new View.OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                Settings.setElevationWanted(elevationWantedButton.isChecked());
             }
         });