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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-03-02 13:18:23 +01:00
commit ca15e61132
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/src/net/osmand/plus/GPXDatabase.java
View file

@ -210,7 +210,8 @@ public class GPXDatabase {
}
private String getFileDir(File itemFile) {
return itemFile.getParentFile().equals(context.getAppPath(IndexConstants.GPX_INDEX_DIR)) ?
return itemFile.getParentFile() == null ||
itemFile.getParentFile().equals(context.getAppPath(IndexConstants.GPX_INDEX_DIR)) ?
"" : itemFile.getParentFile().getName();
}

2
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -1014,7 +1014,7 @@ public class GpxUiHelper {
return (int)value + " " + mainUnitY;
}
});
List<Entry> values = new ArrayList<>();
List<Elevation> elevationData = analysis.elevationData;
float nextX = 0;