diff --git a/documentation/docs/help/en/Advanced preferences.md b/documentation/docs/help/en/Advanced preferences.md index 7a40edccd..8c8db43fc 100644 --- a/documentation/docs/help/en/Advanced preferences.md +++ b/documentation/docs/help/en/Advanced preferences.md @@ -287,7 +287,7 @@ If GPS has been disabled by the user, don't ask to turn it on. Default: _off_. ### Fallback to network location -If the device is providing "Network" location data use it as a fallback if we haven't received a GPS location for a longer time. Default: _on_. +If the device is providing "Network" location data use it as a fallback if we haven't received a GPS location for a longer time. Default: _off_. ### Stale location after diff --git a/documentation/docs/tutorials/network_location.md b/documentation/docs/tutorials/network_location.md index 013ea6358..13813af43 100644 --- a/documentation/docs/tutorials/network_location.md +++ b/documentation/docs/tutorials/network_location.md @@ -12,10 +12,12 @@ If Vespucci detects that network positions can at least potentially be used, it instead of the classic GPS icon on the screen and will alert you to which provider it is currently using via toasts (the short on-screen messages). The fallback to network locations can be disabled in the Location Settings in the Advanced Preferences. -Modern devices running a google variant of Android have three location mode setting (besides turning location services completely off): +~~Modern devices running a google variant of Android have three location mode setting (besides turning location services completely off):~~ -* __Device only__ - use only the on device GPS location information, does not require sharing your location data with google -* __Battery saving__ - doesn't use GPS, instead uses mobile network, WLAN and other signals to determine your location, requires sharing of your location data with google -* __High accuracy__ - uses GPS and other signals to determine your location, requires sharing of your location data with google, this is typically only more "accurate" than __Device only__ if receiving GPS signals is seriously impaired +~~* __Device only__ - use only the on device GPS location information, does not require sharing your location data with google~~ +~~* __Battery saving__ - doesn't use GPS, instead uses mobile network, WLAN and other signals to determine your location, requires sharing of your location data with google~~ +~~* __High accuracy__ - uses GPS and other signals to determine your location, requires sharing of your location data with google, this is typically only more "accurate" than __Device only__ if receiving GPS signals is seriously impaired~~ + +As of Android 14 there seems to only be a _Google Location Accuracy_ setting in _Location services_ that changes if wifi is used or not. Vespucci does not use the Google play servers "fused" location service and remains usable independent of if you are running it in a Google sanctioned environment or not. \ No newline at end of file diff --git a/src/main/assets/help/en/Advanced preferences.html b/src/main/assets/help/en/Advanced preferences.html index 84777dd23..b503e23a6 100644 --- a/src/main/assets/help/en/Advanced preferences.html +++ b/src/main/assets/help/en/Advanced preferences.html @@ -149,7 +149,7 @@

Minimum GPS/GNSS-distance

Leave GPS/GNSS turned off

If GPS has been disabled by the user, don't ask to turn it on. Default: off.

Fallback to network location

-

If the device is providing "Network" location data use it as a fallback if we haven't received a GPS location for a longer time. Default: on.

+

If the device is providing "Network" location data use it as a fallback if we haven't received a GPS location for a longer time. Default: off.

Stale location after

Time, in seconds, after which a location will be considered stale. Default: 60 s

Server Settings

diff --git a/src/main/java/de/blau/android/prefs/Preferences.java b/src/main/java/de/blau/android/prefs/Preferences.java index b74cc2f66..4402b9e8e 100755 --- a/src/main/java/de/blau/android/prefs/Preferences.java +++ b/src/main/java/de/blau/android/prefs/Preferences.java @@ -270,7 +270,7 @@ public Preferences(@NonNull Context ctx) { voiceCommandsEnabled = prefs.getBoolean(r.getString(R.string.config_voiceCommandsEnabled_key), false); leaveGpsDisabled = prefs.getBoolean(r.getString(R.string.config_leaveGpsDisabled_key), false); - allowFallbackToNetworkLocation = prefs.getBoolean(r.getString(R.string.config_gps_network_key), true); + allowFallbackToNetworkLocation = prefs.getBoolean(r.getString(R.string.config_gps_network_key), false); showIcons = prefs.getBoolean(r.getString(R.string.config_showIcons_key), true); diff --git a/src/main/res/xml-v24/advancedpreferences.xml b/src/main/res/xml-v24/advancedpreferences.xml index 54dcebc29..41c61214c 100644 --- a/src/main/res/xml-v24/advancedpreferences.xml +++ b/src/main/res/xml-v24/advancedpreferences.xml @@ -541,7 +541,7 @@ android:summary="@string/config_leaveGpsDisabled_summary" android:title="@string/config_leaveGpsDisabled_title" /> diff --git a/src/main/res/xml-v29/advancedpreferences.xml b/src/main/res/xml-v29/advancedpreferences.xml index a2b9b7fde..e9d2afb88 100644 --- a/src/main/res/xml-v29/advancedpreferences.xml +++ b/src/main/res/xml-v29/advancedpreferences.xml @@ -541,7 +541,7 @@ android:summary="@string/config_leaveGpsDisabled_summary" android:title="@string/config_leaveGpsDisabled_title" /> diff --git a/src/main/res/xml/advancedpreferences.xml b/src/main/res/xml/advancedpreferences.xml index bb07d6e87..ef65d2c49 100644 --- a/src/main/res/xml/advancedpreferences.xml +++ b/src/main/res/xml/advancedpreferences.xml @@ -536,7 +536,7 @@ android:summary="@string/config_leaveGpsDisabled_summary" android:title="@string/config_leaveGpsDisabled_title" />