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-04-06 17:42:59 +02:00
commit 7d51150a2e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,7 +70,7 @@ public class GpxImportHelper {
public boolean handleGpxImport(final Uri contentUri, final boolean useImportDir) {
final String name = getNameFromContentUri(contentUri);
final boolean isOsmandSubdir = isSubDirectory(app.getAppPath(IndexConstants.GPX_INDEX_DIR), new File(contentUri.getPath()));
if (!isOsmandSubdir && name.endsWith(GPX_SUFFIX)) {
if (!isOsmandSubdir && name != null && name.endsWith(GPX_SUFFIX)) {
handleGpxImport(contentUri, name, true, useImportDir);
return true;
}
@ -85,12 +85,7 @@ public class GpxImportHelper {
if (fileName != null && fileName.endsWith(KML_SUFFIX)) {
handleKmlImport(intentUri, fileName, saveFile, useImportDir);
//Issue 2275
// } else if (fileName != null && (fileName.contains("favourite")||
// fileName.contains("favorite"))) {
// handleFavouritesImport(intentUri, fileName, saveFile);
} else {
// handleGpxImport(intentUri, fileName, saveFile);
handleFavouritesImport(intentUri, fileName, saveFile, useImportDir);
}
}
@ -99,7 +94,12 @@ public class GpxImportHelper {
final String name;
final Cursor returnCursor = app.getContentResolver().query(contentUri, null, null, null, null);
if (returnCursor != null && returnCursor.moveToFirst()) {
name = returnCursor.getString(returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
int columnIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
if (columnIndex != -1) {
name = returnCursor.getString(columnIndex);
} else {
name = contentUri.getLastPathSegment();
}
} else {
name = null;
}