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-02-25 00:19:28 +01:00
commit 93e41ed381
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,11 +67,13 @@ public class GpxImportHelper {
if (fileName != null && fileName.endsWith(KML_SUFFIX)) { if (fileName != null && fileName.endsWith(KML_SUFFIX)) {
handleKmlImport(intentUri, fileName, saveFile); handleKmlImport(intentUri, fileName, saveFile);
} else if (fileName != null && (fileName.contains("favourite")|| //Issue 2275
fileName.contains("favorite"))) { // } else if (fileName != null && (fileName.contains("favourite")||
handleFavouritesImport(intentUri, fileName, saveFile); // fileName.contains("favorite"))) {
// handleFavouritesImport(intentUri, fileName, saveFile);
} else { } else {
handleGpxImport(intentUri, fileName, saveFile); // handleGpxImport(intentUri, fileName, saveFile);
handleFavouritesImport(intentUri, fileName, saveFile);
} }
} }