1 files changed, 30 insertions, 8 deletions

diff --git a/main/src/cgeo/geocaching/settings/SettingsActivity.java b/main/src/cgeo/geocaching/settings/SettingsActivity.java
index df6e680..b5d7b68 100644
--- a/main/src/cgeo/geocaching/settings/SettingsActivity.java
+++ b/main/src/cgeo/geocaching/settings/SettingsActivity.java
@@ -1,7 +1,5 @@
 package cgeo.geocaching.settings;
 
-import butterknife.ButterKnife;
-
 import cgeo.geocaching.CgeoApplication;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Intents;
@@ -126,6 +124,7 @@ public class SettingsActivity extends PreferenceActivity {
         initDefaultNavigationPreferences();
         initBackupButtons();
         initDbLocationPreference();
+        initGeoDirPreferences();
         initDebugPreference();
         initBasicMemberPreferences();
         initSend2CgeoPreferences();
@@ -373,12 +372,13 @@ public class SettingsActivity extends PreferenceActivity {
 		final Preference memoryDumpPref = getPreference(R.string.pref_memory_dump);
 		memoryDumpPref
 				.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-					@Override public boolean onPreferenceClick(
-							final Preference preference) {
-						DebugUtils.createMemoryDump(SettingsActivity.this);
-						return true;
-					}
-				});
+                    @Override
+                    public boolean onPreferenceClick(
+                            final Preference preference) {
+                        DebugUtils.createMemoryDump(SettingsActivity.this);
+                        return true;
+                    }
+                });
     }
 
     public static void initHardwareAccelerationPreferences() {
@@ -413,6 +413,28 @@ public class SettingsActivity extends PreferenceActivity {
         });
     }
 
+    private void initGeoDirPreferences() {
+        final Preference playServices = getPreference(R.string.pref_googleplayservices);
+        playServices.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(final Preference preference, final Object newValue) {
+                CgeoApplication.getInstance().setupGeoDataObservables((Boolean) newValue, Settings.useLowPowerMode());
+                return true;
+            }
+        });
+        playServices.setEnabled(CgeoApplication.getInstance().isGooglePlayServicesAvailable());
+        getPreference(R.string.pref_lowpowermode).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(final Preference preference, final Object newValue) {
+                final CgeoApplication app = CgeoApplication.getInstance();
+                final Boolean useLowPower = (Boolean) newValue;
+                app.setupGeoDataObservables(Settings.useGooglePlayServices(), useLowPower);
+                app.setupDirectionObservable(useLowPower);
+                return true;
+            }
+        });
+    }
+
     void initBasicMemberPreferences() {
         getPreference(R.string.preference_screen_basicmembers)
                 .setEnabled(!Settings.isGCPremiumMember());