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

Fix concurrent mod crash

Browse source
This commit is contained in:
Victor Shcherb 2019-03-05 19:15:43 +01:00
parent 8871fdfb91
commit 447407a47a
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
OsmAnd/src/net/osmand/plus/GpxSelectionHelper.java
View file

@ -65,7 +65,7 @@ public class GpxSelectionHelper {
for(SelectedGpxFile s : selectedGPXFiles) {
selectedGpxFilesBackUp.put(s.gpxFile, s.modifiedTime);
}
selectedGPXFiles.clear();
selectedGPXFiles = new ArrayList<>();
saveCurrentSelections();
}
@ -507,7 +507,9 @@ public class GpxSelectionHelper {
} else if (obj.has(CURRENT_TRACK)) {
SelectedGpxFile file = savingTrackHelper.getCurrentTrack();
file.selectedByUser = selectedByUser;
selectedGPXFiles.add(file);
List<SelectedGpxFile> newSelectedGPXFiles = new ArrayList<>(selectedGPXFiles);
newSelectedGPXFiles.add(file);
selectedGPXFiles = newSelectedGPXFiles;
}
}
processSplit();
@ -586,11 +588,13 @@ public class GpxSelectionHelper {
}
}
if (displayed != show) {
List<SelectedGpxFile> newSelectedGPXFiles = new ArrayList<>(selectedGPXFiles);
if (show) {
selectedGPXFiles.add(sf);
newSelectedGPXFiles.add(sf);
} else {
selectedGPXFiles.remove(sf);
newSelectedGPXFiles.remove(sf);
}
selectedGPXFiles = newSelectedGPXFiles;
}
if (syncGroup) {
syncGpxWithMarkers(gpx);