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

[android] fix: LocationHelper method calls moved to UI thread.

Browse source
This commit is contained in:
Alexander Marchuk 2015-12-28 13:18:53 +03:00 • committed by Constantin Shalnev
parent 915712a7ae
commit 283e5463f3
3 changed files with 53 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public enum LocationHelper implements SensorEventListener
private final Listeners<LocationListener> mListeners = new Listeners<>();
private volatile boolean mActive;
private boolean mActive;
private Location mLastLocation;
private MapObject.MyPosition mMyPosition;
@ -146,11 +146,7 @@ public enum LocationHelper implements SensorEventListener
mLocationProvider = new AndroidNativeProvider();
}
synchronized (mListeners)
{
mActive = !mListeners.isEmpty();
}
mActive = !mListeners.isEmpty();
if (mActive)
mLocationProvider.startUpdates();
}
@ -184,70 +180,57 @@ public enum LocationHelper implements SensorEventListener
notifyLocationUpdated();
}
private void notifyLocationUpdated()
protected void notifyLocationUpdated()
{
if (mLastLocation == null)
return;
synchronized (mListeners)
{
for (LocationListener listener : mListeners)
listener.onLocationUpdated(mLastLocation);
mListeners.finishIterate();
}
for (LocationListener listener : mListeners)
listener.onLocationUpdated(mLastLocation);
mListeners.finishIterate();
}
protected void notifyLocationError(int errCode)
{
synchronized (mListeners)
{
for (LocationListener listener : mListeners)
listener.onLocationError(errCode);
mListeners.finishIterate();
}
for (LocationListener listener : mListeners)
listener.onLocationError(errCode);
mListeners.finishIterate();
}
private void notifyCompassUpdated(long time, double magneticNorth, double trueNorth, double accuracy)
{
synchronized (mListeners)
{
for (LocationListener listener : mListeners)
listener.onCompassUpdated(time, magneticNorth, trueNorth, accuracy);
mListeners.finishIterate();
}
for (LocationListener listener : mListeners)
listener.onCompassUpdated(time, magneticNorth, trueNorth, accuracy);
mListeners.finishIterate();
}
@android.support.annotation.UiThread
public void addLocationListener(LocationListener listener, boolean forceUpdate)
{
UiThread.cancelDelayedTasks(mStopLocationTask);
synchronized (mListeners)
if (mListeners.isEmpty())
{
if (mListeners.isEmpty())
{
mActive = true;
mLocationProvider.startUpdates();
}
mListeners.register(listener);
mActive = true;
mLocationProvider.startUpdates();
}
mListeners.register(listener);
if (forceUpdate)
notifyLocationUpdated();
}
@android.support.annotation.UiThread
public void removeLocationListener(LocationListener listener)
{
synchronized (mListeners)
{
boolean wasEmpty = mListeners.isEmpty();
mListeners.unregister(listener);
boolean wasEmpty = mListeners.isEmpty();
mListeners.unregister(listener);
if (!wasEmpty && mListeners.isEmpty())
// Make a delay with disconnection from location providers, so that orientation changes and short app sleeps
// doesn't take long time to connect again.
UiThread.runLater(mStopLocationTask, STOP_DELAY_MS);
}
if (!wasEmpty && mListeners.isEmpty())
// Make a delay with disconnection from location providers, so that orientation changes and short app sleeps
// doesn't take long time to connect again.
UiThread.runLater(mStopLocationTask, STOP_DELAY_MS);
}
void registerSensorListeners()
@ -326,11 +309,8 @@ public enum LocationHelper implements SensorEventListener
return;
mLocationProvider.stopUpdates();
synchronized (mListeners)
{
if (!mListeners.isEmpty())
mLocationProvider.startUpdates();
}
if (!mListeners.isEmpty())
mLocationProvider.startUpdates();
}
public static void onLocationUpdated(@NonNull Location location)

30
android/src/com/mapswithme/maps/location/TrackRecorder.java
View file

@ -172,17 +172,35 @@ public final class TrackRecorder
static void onServiceStarted()
{
TrackRecorder.log("onServiceStarted()");
LocationHelper.INSTANCE.addLocationListener(sLocationListener, false);
TrackRecorder.log("onServiceStarted(). Scheduled to be run on UI thread...");
UiThread.run(new Runnable()
{
@Override
public void run()
{
TrackRecorder.log("onServiceStarted(): actually runs here");
LocationHelper.INSTANCE.addLocationListener(sLocationListener, false);
}
});
}
static void onServiceStopped()
{
TrackRecorder.log("onServiceStopped()");
LocationHelper.INSTANCE.removeLocationListener(sLocationListener);
TrackRecorder.log("onServiceStopped(). Scheduled to be run on UI thread...");
if (!MwmApplication.backgroundTracker().isForeground())
restartAlarmIfEnabled();
UiThread.run(new Runnable()
{
@Override
public void run()
{
TrackRecorder.log("onServiceStopped(): actually runs here");
LocationHelper.INSTANCE.removeLocationListener(sLocationListener);
if (!MwmApplication.backgroundTracker().isForeground())
restartAlarmIfEnabled();
}
});
}
static void log(String message)

4
android/src/com/mapswithme/maps/location/TrackRecorderWakeService.java
View file

@ -45,7 +45,7 @@ public class TrackRecorderWakeService extends IntentService
WakefulBroadcastReceiver.completeWakefulIntent(intent);
}
public synchronized static void start()
public static void start()
{
TrackRecorder.log("SVC.start()");
@ -55,7 +55,7 @@ public class TrackRecorderWakeService extends IntentService
TrackRecorder.log("SVC.start() SKIPPED because (sService != null)");
}
public synchronized static void stop()
public static void stop()
{
TrackRecorder.log("SVC.stop()");