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

Merge pull request #7025 from osmandapp/gpx_selection_fix

Browse source 
gpx selection fix
This commit is contained in:
vshcherb 2019-06-10 12:04:40 +02:00 committed by GitHub
commit 743efb2a1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,11 +60,13 @@ public class GpxSelectionHelper {
savingTrackHelper = trackHelper;
}
public void clearAllGpxFileToShow() {
public void clearAllGpxFileToShow(boolean backupSelection) {
selectedGpxFilesBackUp.clear();
if (backupSelection) {
for(SelectedGpxFile s : selectedGPXFiles) {
selectedGpxFilesBackUp.put(s.gpxFile, s.modifiedTime);
}
}
selectedGPXFiles = new ArrayList<>();
saveCurrentSelections();
}

2
OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
View file

@ -219,7 +219,7 @@ public class ConfigureMapMenu {
} else if (itemId == R.string.layer_gpx_layer) {
final GpxSelectionHelper selectedGpxHelper = ma.getMyApplication().getSelectedGpxHelper();
if (selectedGpxHelper.isShowingAnyGpxFiles()) {
selectedGpxHelper.clearAllGpxFileToShow();
selectedGpxHelper.clearAllGpxFileToShow(true);
adapter.getItem(pos).setDescription(selectedGpxHelper.getGpxDescription());
} else {
showGpxSelectionDialog(adapter, adapter.getItem(pos));

2
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -613,7 +613,7 @@ public class GpxUiHelper {
//clear all previously selected files before adding new one
OsmandApplication app = (OsmandApplication) activity.getApplication();
if (app != null && app.getSelectedGpxHelper() != null) {
app.getSelectedGpxHelper().clearAllGpxFileToShow();
app.getSelectedGpxHelper().clearAllGpxFileToShow(false);
}
if (app != null && showCurrentGpx && adapter.getItem(0).getSelected()) {
currentGPX = app.getSavingTrackHelper().getCurrentGpx();

2
OsmAnd/src/net/osmand/plus/quickaction/actions/ShowHideGpxTracksAction.java
View file

@ -36,7 +36,7 @@ public class ShowHideGpxTracksAction extends QuickAction {
final GpxSelectionHelper selectedGpxHelper = activity.getMyApplication()
.getSelectedGpxHelper();
if (selectedGpxHelper.isShowingAnyGpxFiles()) {
selectedGpxHelper.clearAllGpxFileToShow();
selectedGpxHelper.clearAllGpxFileToShow(true);
} else {
selectedGpxHelper.restoreSelectedGpxFiles();
}