Merge branch 'master' of ssh://github.com/osmandapp/Osmand into PaulsBranch

This commit is contained in:
PaulStets 2018-05-31 13:56:23 +03:00
commit 33e973d684

View file

@ -607,7 +607,8 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
}
}
private void addOptionSplit(int value, boolean distance, List<GpxDisplayGroup> model) {
private void addOptionSplit(int value, boolean distance, @NonNull List<GpxDisplayGroup> model) {
if (model.size() > 0) {
if (distance) {
double dvalue = OsmAndFormatter.calculateRoundedDist(value, app);
options.add(OsmAndFormatter.getFormattedDistance((float) dvalue, app));
@ -631,6 +632,7 @@ public class TrackActivityFragmentAdapter implements TrackBitmapDrawerListener {
}
}
}
}
private void updateSplitInDatabase() {
int splitType = 0;