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

Fix #3603

Browse source
This commit is contained in:
alex 2017-05-25 22:55:08 +03:00
parent 143b058ea2
commit 3d3551717e
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
View file

@ -1232,10 +1232,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
}
}
private class OpenGpxDetailsTask extends AsyncTask<Void, Void, GPXFile> {
private class OpenGpxDetailsTask extends AsyncTask<Void, Void, Void> {
GpxInfo gpxInfo;
Dialog progressDialog;
ProgressDialog progressDialog;
List<GpxDisplayGroup> gpxDisplayGroupList;
OpenGpxDetailsTask(GpxInfo gpxInfo) {
this.gpxInfo = gpxInfo;
@ -1244,29 +1245,35 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
@Override
protected void onPreExecute() {
progressDialog = new ProgressDialog(getActivity());
progressDialog.setTitle("");
progressDialog.setMessage(getActivity().getResources().getString(R.string.loading_data));
progressDialog.setCancelable(false);
progressDialog.setTitle(R.string.loading_data);
progressDialog.show();
}
@Override
protected GPXFile doInBackground(Void... voids) {
protected Void doInBackground(Void... voids) {
GPXFile result;
if (gpxInfo.gpx == null) {
if (gpxInfo.file == null) {
result = getMyApplication().getSavingTrackHelper().getCurrentGpx();
} else {
publishProgress();
result = GPXUtilities.loadGPXFile(getActivity(), gpxInfo.file);
}
gpxDisplayGroupList = selectedGpxHelper.collectDisplayGroups(result);
} else {
return gpxInfo.gpx;
gpxDisplayGroupList = selectedGpxHelper.collectDisplayGroups(gpxInfo.gpx);
}
return result;
return null;
}
@Override
protected void onPostExecute(GPXFile gpxFile) {
List<GpxDisplayGroup> gpxDisplayGroupList = selectedGpxHelper.collectDisplayGroups(gpxFile);
protected void onProgressUpdate(Void... values) {
progressDialog.show();
}
@Override
protected void onPostExecute(Void aVoid) {
List<GpxDisplayItem> items = null;
for (GpxDisplayGroup group : gpxDisplayGroupList) {
if (group.getType() == GpxSelectionHelper.GpxDisplayItemType.TRACK_SEGMENT) {
@ -1297,10 +1304,10 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
new PointDescription(PointDescription.POINT_TYPE_WPT, gpxItem.name),
false,
gpxItem);
progressDialog.dismiss();
MapActivity.launchMapActivityMoveToTop(getActivity());
}
}
progressDialog.cancel();
}
}