Improve handling state changes of location providers, fixes #76 (48ef624b) · Commits · Android-smartphones / Ulogger Android

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

+53 −48

Original line number	Diff line number	Diff line
		@@ -25,6 +25,9 @@ import androidx.annotation.Nullable;
		import androidx.core.app.ActivityCompat;
		import androidx.preference.PreferenceManager;

		import java.util.ArrayList;
		import java.util.List;

		class LocationHelper {

		private static final String TAG = LocationHelper.class.getSimpleName();
		@@ -46,8 +49,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 boolean useGps;
		private boolean useNet;
		private List<String> userProviders = new ArrayList<>();


		private LocationHelper(@NonNull Context context) {
		@@ -79,8 +81,13 @@ class LocationHelper {
		minTimeMillis = Long.parseLong(prefs.getString(SettingsActivity.KEY_MIN_TIME, context.getString(R.string.pref_mintime_default))) * 1000;
		minDistance = Float.parseFloat(prefs.getString(SettingsActivity.KEY_MIN_DISTANCE, context.getString(R.string.pref_mindistance_default)));
		maxAccuracy = Integer.parseInt(prefs.getString(SettingsActivity.KEY_MIN_ACCURACY, context.getString(R.string.pref_minaccuracy_default)));
		useGps = prefs.getBoolean(SettingsActivity.KEY_USE_GPS, providerExists(LocationManager.GPS_PROVIDER));
		useNet = prefs.getBoolean(SettingsActivity.KEY_USE_NET, providerExists(LocationManager.NETWORK_PROVIDER));
		userProviders.clear();
		if (prefs.getBoolean(SettingsActivity.KEY_USE_GPS, providerExists(LocationManager.GPS_PROVIDER))) {
		userProviders.add(LocationManager.GPS_PROVIDER);
		}
		if (prefs.getBoolean(SettingsActivity.KEY_USE_NET, providerExists(LocationManager.NETWORK_PROVIDER))) {
		userProviders.add(LocationManager.NETWORK_PROVIDER);
		}
		liveSync = prefs.getBoolean(SettingsActivity.KEY_LIVE_SYNC, false);
		}

		@@ -114,53 +121,38 @@ class LocationHelper {
		* @throws LoggerException Exception on permission denied or all providers disabled
		*/
		void requestSingleUpdate(@NonNull LocationListener listener, @Nullable Looper looper) throws LoggerException {
		int errorCode = LoggerException.E_DISABLED;
		if (useNet) {
		try {
		requestProviderUpdates(LocationManager.NETWORK_PROVIDER, listener, looper, true);
		errorCode = LoggerException.E_OK;
		} catch (LoggerException e) {
		errorCode = e.getCode();
		}
		}
		if (useGps) {
		try {
		requestProviderUpdates(LocationManager.GPS_PROVIDER, listener, looper, true);
		errorCode = LoggerException.E_OK;
		} catch (LoggerException e) {
		errorCode = e.getCode();
		}
		}
		if (errorCode != LoggerException.E_OK) {
		throw new LoggerException(errorCode);
		}
		requestAllProvidersUpdates(listener, looper, true);
		}

		/**
		* Request location updates for user selected providers
		* @param listener Listener
		* @param looper Looper
		* @throws LoggerException Exception on permission denied or all providers disabled
		* @throws LoggerException Exception on all requested providers failure
		*/
		void requestLocationUpdates(@NonNull LocationListener listener, @Nullable Looper looper) throws LoggerException {
		int errorCode = LoggerException.E_DISABLED;
		if (useNet) {
		try {
		requestProviderUpdates(LocationManager.NETWORK_PROVIDER, listener, looper, false);
		errorCode = LoggerException.E_OK;
		} catch (LoggerException e) {
		errorCode = e.getCode();
		requestAllProvidersUpdates(listener, looper, false);
		}
		}
		if (useGps) {

		/**
		* Request location updates for user selected providers
		* @param listener Listener
		* @param looper Looper
		* @param singleShot Request single update if true
		* @throws LoggerException Exception on all requested providers failure
		*/
		private void requestAllProvidersUpdates(@NonNull LocationListener listener, @Nullable Looper looper, boolean singleShot) throws LoggerException {
		List<Integer> results = new ArrayList<>();
		for (String provider : userProviders) {
		try {
		requestProviderUpdates(LocationManager.GPS_PROVIDER, listener, looper, false);
		errorCode = LoggerException.E_OK;
		requestProviderUpdates(provider, listener, looper, singleShot);
		results.add(LoggerException.E_OK);
		} catch (LoggerException e) {
		errorCode = e.getCode();
		results.add(e.getCode());
		}
		}
		if (errorCode != LoggerException.E_OK) {
		if (!results.contains(LoggerException.E_OK)) {
		int errorCode = results.isEmpty() ? LoggerException.E_DISABLED : results.get(0);
		throw new LoggerException(errorCode);
		}
		}
		@@ -171,18 +163,18 @@ class LocationHelper {
		* @param listener Listener
		* @param looper Looper
		* @param singleShot Request single update if true
		* @throws LoggerException Exception on permission denied or all providers disabled
		* @throws LoggerException Exception on permission denied or provider disabled
		*/
		private void requestProviderUpdates(@NonNull String provider, @NonNull LocationListener listener, @Nullable Looper looper, boolean singleShot) throws LoggerException {
		if (Logger.DEBUG) { Log.d(TAG, "[requestProviderUpdates: " + provider + " (" + singleShot + ")]"); }
		try {
		if (locationManager.isProviderEnabled(provider)) {
		if (singleShot) {
		locationManager.requestSingleUpdate(provider, listener, looper);
		} else {
		if (!singleShot) {
		// 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)) {
		locationManager.requestSingleUpdate(provider, listener, looper);
		}
		if (Logger.DEBUG) { Log.d(TAG, "[requestProviderUpdates success: " + provider + " (" + singleShot + ")]"); }
		} else {
		if (!locationManager.isProviderEnabled(provider)) {
		if (Logger.DEBUG) { Log.d(TAG, "[requestProviderUpdates disabled: " + provider + " (" + singleShot + ")]"); }
		throw new LoggerException("Provider disabled", LoggerException.E_DISABLED);
		}
		@@ -201,6 +193,19 @@ class LocationHelper {
		locationManager.removeUpdates(listener);
		}

		/**
		* Is any of user location providers enabled
		* @return True if enabled
		*/
		boolean hasEnabledProviders() {
		for (String provider : userProviders) {
		if (locationManager.isProviderEnabled(provider)) {
		return true;
		}
		}
		return false;
		}

		/**
		* Check location accuracy meets user criteria
		* @param location Location

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ public class LoggerService extends Service {
		looper = thread.getLooper();

		try {
		locationHelper.updatePreferences();
		locationHelper.requestLocationUpdates(locationListener, looper);
		setRunning(true);
		sendBroadcast(BROADCAST_LOCATION_STARTED);
		@@ -152,7 +153,6 @@ public class LoggerService extends Service {
		// no valid providers after preferences update
		stopSelf();
		}

		}
		}

		@@ -189,7 +189,6 @@ public class LoggerService extends Service {
		thread.interrupt();
		thread = null;
		}

		}

		@Override
		@@ -355,6 +354,9 @@ public class LoggerService extends Service {
		} else if (provider.equals(LocationManager.NETWORK_PROVIDER)) {
		sendBroadcast(BROADCAST_LOCATION_NETWORK_DISABLED);
		}
		if (!locationHelper.hasEnabledProviders()) {
		sendBroadcast(BROADCAST_LOCATION_DISABLED);
		}
		}

		/**
		@@ -374,8 +376,6 @@ public class LoggerService extends Service {

		@SuppressWarnings({"deprecation", "RedundantSuppression"})
		@Override
		public void onStatusChanged(String provider, int status, Bundle extras) {

		}
		public void onStatusChanged(String provider, int status, Bundle extras) { }
		}
		}