Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #700 from steventebrinke/master

Browse source 
Puts proper user info in live monitoring url.
This commit is contained in:
Hardy 2014-06-15 12:23:41 +02:00
commit 09c09d2932
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/monitoring/LiveMonitoringHelper.java
View file

@ -48,11 +48,9 @@ public class LiveMonitoringHelper {
if (OsmAndLocationProvider.isPointAccurateForRouting(location) && isLiveMonitoringEnabled()
&& OsmandPlugin.getEnabledPlugin(OsmandMonitoringPlugin.class) != null) {
long locationTime = System.currentTimeMillis();
//* 1000 in next line seems to be wrong with new IntervalChooseDialog
//if (time - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get() * 1000) {
if (locationTime - lastTimeUpdated > settings.LIVE_MONITORING_INTERVAL.get()) {
LiveMonitoringData data = new LiveMonitoringData((float)location.getLatitude(), (float)location.getLongitude(),
(float) location.getAltitude(),(float) location.getSpeed(),(float) location.getAccuracy(), (float) location.getBearing(), locationTime );
(float)location.getAltitude(), location.getSpeed(), location.getAccuracy(), location.getBearing(), locationTime);
new LiveSender().execute(data);
lastTimeUpdated = locationTime;
}
@ -141,7 +139,7 @@ public class LiveMonitoringHelper {
DefaultHttpClient httpclient = new DefaultHttpClient(params);
// Parse the URL and let the URI constructor handle proper encoding of special characters such as spaces
URL u = new URL(url);
URI uri = new URI(u.getProtocol(), u.getAuthority(), u.getHost(), u.getPort(), u.getPath(), u.getQuery(), u.getRef());
URI uri = new URI(u.getProtocol(), u.getUserInfo(), u.getHost(), u.getPort(), u.getPath(), u.getQuery(), u.getRef());
HttpRequestBase method = new HttpGet(uri);
log.info("Monitor " + uri);
HttpResponse response = httpclient.execute(method);