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

Merge remote-tracking branch 'origin/live_monitoring_fixes' into live_monitoring_fixes

Browse source
This commit is contained in:
PavelRatushny 2017-07-21 11:26:55 +03:00
commit 05acac410f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/res/values/strings.xml
View file

@ -1936,8 +1936,8 @@
<string name="live_monitoring_interval">Online tracking interval</string>
<string name="live_monitoring_url_descr">Specify the web address with parameter syntax: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6}</string>
<string name="live_monitoring_url">Online tracking web address</string>
<string name="live_monitoring_max_interval_to_send">Maximum online tracking interval to send</string>
<string name="live_monitoring_max_interval_to_send_desrc">Specify maximum online tracking interval to send</string>
<string name="live_monitoring_max_interval_to_send">Time buffer for online tracking</string>
<string name="live_monitoring_max_interval_to_send_desrc">Specify a time buffer to keep locations to send without connection</string>
<string name="gpx_monitoring_disabled_warn">Log track using GPX widget or via \'Trip recording\' settings.</string>
<string name="show_current_gpx_title">Show current track</string>
<string name="free_version_message">This free OsmAnd version is limited to %1$s downloads and does not support offline Wikipedia articles.</string>

4
OsmAnd/src/net/osmand/plus/monitoring/OsmandMonitoringPlugin.java
View file

@ -131,7 +131,7 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
public static final int[] SECONDS = new int[] {0, 1, 2, 3, 5, 10, 15, 30, 60, 90};
public static final int[] MINUTES = new int[] {2, 3, 5};
public static final int[] MAX_INTERVAL_TO_SEND_MINUTES = new int[] {5, 10, 15};
public static final int[] MAX_INTERVAL_TO_SEND_MINUTES = new int[] {1, 2, 5, 10, 15, 20, 30, 60};
@Override
@ -514,4 +514,4 @@ public class OsmandMonitoringPlugin extends OsmandPlugin {
return DashTrackFragment.FRAGMENT_DATA;
}
}
}