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

Fix #4895

Browse source
This commit is contained in:
Victor Shcherb 2018-01-14 19:14:50 +02:00
parent 988e3cf0c0
commit de4d697945
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -200,25 +200,23 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
File fout = new File(dir, f + ".gpx"); //$NON-NLS-1$ File fout = new File(dir, f + ".gpx"); //$NON-NLS-1$
if (!data.get(f).isEmpty()) { if (!data.get(f).isEmpty()) {
WptPt pt = data.get(f).findPointToShow(); WptPt pt = data.get(f).findPointToShow();
File targetDir = dir;
if (ctx.getSettings().STORE_TRACKS_IN_MONTHLY_DIRECTORIES.get()) { if (ctx.getSettings().STORE_TRACKS_IN_MONTHLY_DIRECTORIES.get()) {
SimpleDateFormat dateDirFormat = new SimpleDateFormat("yyyy-MM"); SimpleDateFormat dateDirFormat = new SimpleDateFormat("yyyy-MM");
dateDirFormat.setTimeZone(TimeZone.getTimeZone("UTC")); dateDirFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
String dateDirName = dateDirFormat.format(new Date(pt.time)); String dateDirName = dateDirFormat.format(new Date(pt.time));
File dateDir = new File(dir, dateDirName); File dateDir = new File(dir, dateDirName);
dateDir.mkdirs(); dateDir.mkdirs();
if (dateDir.exists()) { if (dateDir.exists()) {
dir = dateDir; targetDir = dateDir;
} }
} }
String fileName = f + "_" + new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time)); //$NON-NLS-1$ String fileName = f + "_" + new SimpleDateFormat("HH-mm_EEE", Locale.US).format(new Date(pt.time)); //$NON-NLS-1$
fout = new File(dir, fileName + ".gpx"); //$NON-NLS-1$ fout = new File(targetDir, fileName + ".gpx"); //$NON-NLS-1$
int ind = 1; int ind = 1;
while (fout.exists()) { while (fout.exists()) {
fout = new File(dir, fileName + "_" + (++ind) + ".gpx"); //$NON-NLS-1$ //$NON-NLS-2$ fout = new File(targetDir, fileName + "_" + (++ind) + ".gpx"); //$NON-NLS-1$ //$NON-NLS-2$
} }
} }