Commit 473bad86 authored by Bartek Fabiszewski's avatar Bartek Fabiszewski
Browse files

Use getCurrentLocation on API 30+ (WIP)

parent c87707ce

app/src/main/java/net/fabiszewski/ulogger/LocationHelper.java

+13 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ import android.content.pm.PackageManager; 
import android.location.Location;

import android.location.LocationListener;

import android.location.LocationManager;

import android.os.Build;

import android.os.Handler;

import android.os.Looper;

import android.os.SystemClock;

import android.util.Log;
@@ -49,7 +51,7 @@ class LocationHelper { 
    // max time tolerance is half min time, but not more that 5 min

    final private long minTimeTolerance = Math.min(minTimeMillis / 2, 5 * 60 * 1000);

    final private long maxTimeMillis = minTimeMillis + minTimeTolerance;

    private List<String> userProviders = new ArrayList<>();

    private final List<String> userProviders = new ArrayList<>();





    private LocationHelper(@NonNull Context context) {
@@ -172,8 +174,17 @@ class LocationHelper { 
                // request even if provider is disabled to allow users re-enable it later

                locationManager.requestLocationUpdates(provider, minTimeMillis, minDistance, listener, looper);

            } else if (locationManager.isProviderEnabled(provider)) {

                // FIXME: original caller should be rewritten instead?

                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {

                    locationManager.getCurrentLocation(provider, null, runnable -> {

                        if (looper != null) {

                            new Handler(looper).post(runnable);

                        }

                    }, listener::onLocationChanged);

                } else {

                    locationManager.requestSingleUpdate(provider, listener, looper);

                }

            }

            if (!locationManager.isProviderEnabled(provider)) {

                if (Logger.DEBUG) { Log.d(TAG, "[requestProviderUpdates disabled: " + provider + " (" + singleShot + ")]"); }

                throw new LoggerException("Provider disabled", LoggerException.E_DISABLED);