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 2016-06-08 10:55:32 +02:00
commit dc6f4f7ecb
3 changed files with 78 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/GPXUtilities.java
View file

@ -441,7 +441,6 @@ public class GPXUtilities {
}
// 5. Max speed and Average speed, if any. Average speed is NOT overall (effective) speed, but only calculated for "moving" periods.
if (speedCount > 0) {
if (timeMoving > 0) {

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -539,7 +539,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
gpxImportHelper.handleFileImport(data, new File(data.getPath()).getName());
setIntent(null);
} else if ("content".equals(scheme)) {
gpxImportHelper.handleContenImport(data);
gpxImportHelper.handleContentImport(data);
setIntent(null);
} else if ("google.navigation".equals(scheme) || "osmand.navigation".equals(scheme)) {
parseNavigationIntent(data);

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

@ -52,7 +52,7 @@ public class GpxImportHelper {
this.mapView = mapView;
}
public void handleContenImport(final Uri contentUri) {
public void handleContentImport(final Uri contentUri) {
final String name = getNameFromContentUri(contentUri);
handleFileImport(contentUri, name);