PeterCxy/UnifiedNlp
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #77 from mvglasow/no-stale-location

Browse source 
Report a new location only after receiving a non-null update
This commit is contained in:
Marvin W 2016-03-18 23:15:46 +01:00
parent bcf1cff35e 1093f404ab
commit 7b31a55ef3
2 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
unifiednlp-base/src/main/java/org/microg/nlp/location/BackendFuser.java
View file

@ -78,12 +78,15 @@ class BackendFuser {
}
public void update() {
boolean hasUpdates = false;
fusing = true;
for (BackendHelper handler : backendHelpers) {
handler.update();
if (handler.update() != null)
hasUpdates = true;
}
fusing = false;
updateLocation();
if (hasUpdates)
updateLocation();
}
void updateLocation() {
@ -132,11 +135,14 @@ class BackendFuser {
}
public void forceLocation(Location location) {
if ((forcedLocation != null) && (location != null) && (forcedLocation.getTime() >= location.getTime()))
return;
forcedLocation = location;
if (forcedLocation != null) {
Bundle extras = new Bundle();
extras.putString(LOCATION_EXTRA_BACKEND_PROVIDER, "forced");
location.setExtras(extras);
reportLocation();
}
}

19
unifiednlp-base/src/main/java/org/microg/nlp/location/BackendHelper.java
View file

@ -54,20 +54,31 @@ class BackendHelper extends AbstractBackendHelper {
return lastLocation;
}
public void update() {
/**
* @brief Requests a location update from the backend.
*
* @return The location reported by the backend. This may be null if a backend cannot determine its
* location, or if it is going to return a location asynchronously.
*/
public Location update() {
Location result = null;
if (backend == null) {
Log.d(TAG, "Not (yet) bound.");
updateWaiting = true;
} else {
updateWaiting = false;
try {
setLastLocation(backend.update());
backendFuser.reportLocation();
result = backend.update();
if ((result != null) && (result.getTime() > lastLocation.getTime())) {
setLastLocation(result);
backendFuser.reportLocation();
}
} catch (Exception e) {
Log.w(TAG, e);
unbind();
}
}
return result;
}
private void setLastLocation(Location location) {
@ -139,6 +150,8 @@ class BackendHelper extends AbstractBackendHelper {
private class Callback extends LocationCallback.Stub {
@Override
public void report(Location location) throws RemoteException {
if ((location == null) || (location.getTime() <= lastLocation.getTime()))
return;
setLastLocation(location);
backendFuser.reportLocation();
}