Added option to disable use of location data.

jklmnn · Mar 7, 2015 · fb13ab3 · fb13ab3
1 parent 8a2c553
commit fb13ab3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/app/src/main/java/de/jkliemann/parkendd/GlobalSettings.java b/app/src/main/java/de/jkliemann/parkendd/GlobalSettings.java
@@ -1,13 +1,12 @@
 package de.jkliemann.parkendd;
 
 import android.content.Context;
-import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
-import android.location.LocationProvider;
 import android.os.Bundle;
 import android.os.Looper;
+import android.preference.PreferenceManager;
 
 /**
  * Created by jkliemann on 07.01.15.
@@ -67,8 +66,12 @@ public void onProviderDisabled(String provider) {
         locationManager.requestLocationUpdates(locationProvider, (long) 60000, (float) 50, locationListener, Looper.getMainLooper());
     }
 
-    public Location getLastKnownLocation(){
-        return locationManager.getLastKnownLocation(locationProvider);
+    public Location getLastKnownLocation() {
+        if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("use_location", true)){
+            return locationManager.getLastKnownLocation(locationProvider);
+        }else {
+            return null;
+        }
     }
 
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,6 +12,7 @@
     <string name="header_network">Netzwerk</string>
     <string name="setting_server">Server</string>
     <string name="setting_city">Stadt</string>
+    <string name="setting_location">Standort nutzen</string>
     <string name="setting_reset">Zurücksetzen</string>
     <string name="setting_ignore_cert">SSL-Zertifikat ignorieren (unsicher!)</string>
     <!--defaults-->

diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
@@ -2,7 +2,11 @@
 
     <ListPreference
         android:key="city"
-        android:title="Stadt"
+        android:title="@string/setting_city"
         android:defaultValue="Dresden"/>
+    <CheckBoxPreference
+        android:key="use_location"
+        android:title="@string/setting_location"
+        android:defaultValue="true"/>
 
 </PreferenceScreen>