Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-06-13 10:59:02 +02:00
commit e3753c6ff4

View file

@ -687,7 +687,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
final List<File> dirs = new ArrayList<>(); final List<File> dirs = new ArrayList<>();
collectDirs(app.getAppPath(IndexConstants.GPX_INDEX_DIR), dirs, info.file.getParentFile()); collectDirs(app.getAppPath(IndexConstants.GPX_INDEX_DIR), dirs, info.file.getParentFile());
if (!dirs.isEmpty()) {
if (!info.file.getParentFile().equals(app.getAppPath(IndexConstants.GPX_INDEX_DIR))) { if (!info.file.getParentFile().equals(app.getAppPath(IndexConstants.GPX_INDEX_DIR))) {
dirs.add(0, app.getAppPath(IndexConstants.GPX_INDEX_DIR)); dirs.add(0, app.getAppPath(IndexConstants.GPX_INDEX_DIR));
} }
@ -806,7 +805,6 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
builder.setNegativeButton(R.string.shared_string_cancel, null); builder.setNegativeButton(R.string.shared_string_cancel, null);
builder.create().show(); builder.create().show();
} }
}
public class LoadGpxTask extends AsyncTask<Activity, GpxInfo, List<GpxInfo>> { public class LoadGpxTask extends AsyncTask<Activity, GpxInfo, List<GpxInfo>> {