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

SharingTrack.gpx route from OpenTracks not reset

Browse source
This commit is contained in:
androiddevkotlin 2021-04-24 14:22:10 +03:00
parent 9d39e2f805
commit fe18efd9e1
1 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
OsmAnd/src/net/osmand/plus/importfiles/ImportHelper.java
View file

@ -57,6 +57,8 @@ import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT; import static net.osmand.IndexConstants.BINARY_MAP_INDEX_EXT;
@ -82,6 +84,7 @@ import static net.osmand.plus.settings.backend.backup.SettingsHelper.SILENT_IMPO
public class ImportHelper { public class ImportHelper {
public static final Log log = PlatformUtil.getLog(ImportHelper.class); public static final Log log = PlatformUtil.getLog(ImportHelper.class);
final static Pattern PATTERN = Pattern.compile("(.*?)(?:\\((\\d+)\\))?(\\.[^.]*)?");
public static final String KML_SUFFIX = ".kml"; public static final String KML_SUFFIX = ".kml";
public static final String KMZ_SUFFIX = ".kmz"; public static final String KMZ_SUFFIX = ".kmz";
@ -106,7 +109,7 @@ public class ImportHelper {
this.extension = extension; this.extension = extension;
} }
private String extension; private final String extension;
public String getExtension() { public String getExtension() {
return extension; return extension;
@ -418,7 +421,7 @@ public class ImportHelper {
handleResult(result, name, fileSize, save, useImportDir, forceImportFavourites, true); handleResult(result, name, fileSize, save, useImportDir, forceImportFavourites, true);
} }
protected void handleResult(final GPXFile result, final String name, long fileSize, final boolean save, protected void handleResult(final GPXFile result, String name, long fileSize, final boolean save,
final boolean useImportDir, boolean forceImportFavourites, boolean showInDetailsActivity) { final boolean useImportDir, boolean forceImportFavourites, boolean showInDetailsActivity) {
if (result != null) { if (result != null) {
if (result.error != null) { if (result.error != null) {
@ -429,6 +432,7 @@ public class ImportHelper {
} else { } else {
if (save) { if (save) {
String existingFilePath = getExistingFilePath(name, fileSize); String existingFilePath = getExistingFilePath(name, fileSize);
name = getNewName(name);
if (existingFilePath != null) { if (existingFilePath != null) {
app.showToastMessage(R.string.file_already_imported); app.showToastMessage(R.string.file_already_imported);
showGpxInDetailsActivity(existingFilePath); showGpxInDetailsActivity(existingFilePath);
@ -489,10 +493,47 @@ public class ImportHelper {
if (nameWithoutDirs.equals(name) && gpxInfo.getFileSize() == fileSize) { if (nameWithoutDirs.equals(name) && gpxInfo.getFileSize() == fileSize) {
return fileName; return fileName;
} }
if (nameWithoutDirs.equals(name)) {
name += name;
}
} }
return null; return null;
} }
String getNewName(String filename) {
if (isDuplicateName(filename)) {
Matcher m = PATTERN.matcher(filename);
if (m.matches()) {
String prefix = m.group(1);
String last = m.group(2);
String suffix = m.group(3);
if (suffix == null) suffix = "";
int count = last != null ? Integer.parseInt(last) : 0;
do {
count++;
filename = prefix + "(" + count + ")" + suffix;
} while (isDuplicateName(filename));
}
}
return filename;
}
@Nullable
private boolean isDuplicateName(String name) {
File dir = app.getAppPath(GPX_INDEX_DIR);
List<GPXInfo> gpxInfoList = GpxUiHelper.getSortedGPXFilesInfoByDate(dir, true);
for (GPXInfo gpxInfo : gpxInfoList) {
String fileName = gpxInfo.getFileName();
String nameWithoutDirs = Algorithms.getFileWithoutDirs(fileName);
if (nameWithoutDirs.equals(name)) {
return true;
}
}
return false;
}
private String saveImport(final GPXFile gpxFile, final String fileName, final boolean useImportDir) { private String saveImport(final GPXFile gpxFile, final String fileName, final boolean useImportDir) {
final String warning; final String warning;
@ -555,7 +596,7 @@ public class ImportHelper {
private final GPXFile result; private final GPXFile result;
private final String name; private final String name;
private final boolean useImportDir; private final boolean useImportDir;
private boolean showInDetailsActivity; private final boolean showInDetailsActivity;
private SaveAsyncTask(GPXFile result, final String name, boolean useImportDir, boolean showInDetailsActivity) { private SaveAsyncTask(GPXFile result, final String name, boolean useImportDir, boolean showInDetailsActivity) {
this.result = result; this.result = result;