AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Ignore possible false-positive location availability.

Browse source 
Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako 2022-04-24 07:32:37 +03:00 • committed by Alexander Borsuk
parent 9abafe48f9
commit 44260ae3df
3 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
android/flavors/gms-enabled/com/mapswithme/maps/location/GoogleFusedLocationProvider.java
View file

@ -37,16 +37,17 @@ class GoogleFusedLocationProvider extends BaseLocationProvider
// Documentation is inconsistent with the code: "returns null if no locations are available".
// https://developers.google.com/android/reference/com/google/android/gms/location/LocationResult#getLastLocation()
//noinspection ConstantConditions
if (location == null)
return;
mListener.onLocationChanged(location);
if (location != null)
mListener.onLocationChanged(location);
}
@Override
public void onLocationAvailability(@NonNull LocationAvailability availability)
{
if (!availability.isLocationAvailable())
mListener.onLocationError(ERROR_GPS_OFF);
if (!availability.isLocationAvailable()) {
LOGGER.w(TAG, "isLocationAvailable returned false");
//mListener.onLocationError(ERROR_GPS_OFF);
}
}
}

8
android/src/com/mapswithme/maps/location/LocationHelper.java
View file

@ -319,11 +319,15 @@ public enum LocationHelper implements Initializable<Context>, AppBackgroundTrack
public void onLocationError(int errCode)
{
mLogger.d(TAG, "onLocationError(): " + errCode);
if (errCode == ERROR_NOT_SUPPORTED && !(mLocationProvider instanceof AndroidNativeProvider))
if (errCode == ERROR_NOT_SUPPORTED &&
LocationUtils.areLocationServicesTurnedOn(mContext) &&
!(mLocationProvider instanceof AndroidNativeProvider))
{
// Try to downgrade to native provider first before notifying the user.
// If location service is enabled, try to downgrade to the native provider first
// and restart the service before notifying the user.
mLogger.d(TAG, "Downgrading to use native provider");
mLocationProvider = new AndroidNativeProvider(mContext, this);
restart();
return;
}

16
android/src/com/mapswithme/util/LocationUtils.java
View file

@ -5,6 +5,7 @@ import android.content.ContentResolver;
import android.content.Context;
import android.location.Location;
import android.location.LocationManager;
import android.os.Build;
import android.provider.Settings;
import android.view.Surface;
@ -99,17 +100,20 @@ public class LocationUtils
return newLocation.getAccuracy() < lastAccuracy;
}
@SuppressLint("InlinedApi")
@SuppressWarnings("deprecation")
public static boolean areLocationServicesTurnedOn(@NonNull Context context)
{
final ContentResolver resolver = context.getContentResolver();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
{
final LocationManager lm = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
return lm.isLocationEnabled();
}
try
{
return Settings.Secure.getInt(resolver, Settings.Secure.LOCATION_MODE)
return Settings.Secure.getInt(context.getContentResolver(), Settings.Secure.LOCATION_MODE)
!= Settings.Secure.LOCATION_MODE_OFF;
} catch (Settings.SettingNotFoundException e)
}
catch (Settings.SettingNotFoundException e)
{
e.printStackTrace();
return false;