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

fix close changeset

Browse source
This commit is contained in:
Victor Shcherb 2015-11-09 10:27:55 +01:00
parent 861831980f
commit 674f552356
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
View file

@ -570,7 +570,6 @@ public class EditPoiDialogFragment extends DialogFragment {
} }
} }
// TODO: 8/28/15 Move to helper
public static class ShowDeleteDialogAsyncTask extends AsyncTask<Amenity, Void, Node> { public static class ShowDeleteDialogAsyncTask extends AsyncTask<Amenity, Void, Node> {
private final OpenstreetmapUtil openstreetmapUtil; private final OpenstreetmapUtil openstreetmapUtil;
private final AppCompatActivity activity; private final AppCompatActivity activity;

7
OsmAnd/src/net/osmand/plus/osmedit/UploadOpenstreetmapPointAsyncTask.java
View file

@ -45,6 +45,7 @@ public class UploadOpenstreetmapPointAsyncTask
protected Map<OsmPoint, String> doInBackground(OsmPoint... points) { protected Map<OsmPoint, String> doInBackground(OsmPoint... points) {
Map<OsmPoint, String> loadErrorsMap = new HashMap<>(); Map<OsmPoint, String> loadErrorsMap = new HashMap<>();
boolean uploaded = false;
for (OsmPoint point : points) { for (OsmPoint point : points) {
if (interruptUploading) if (interruptUploading)
break; break;
@ -56,8 +57,9 @@ public class UploadOpenstreetmapPointAsyncTask
entityInfo = remotepoi.loadNode(p.getEntity()); entityInfo = remotepoi.loadNode(p.getEntity());
} }
Node n = remotepoi.commitNodeImpl(p.getAction(), p.getEntity(), entityInfo, Node n = remotepoi.commitNodeImpl(p.getAction(), p.getEntity(), entityInfo,
p.getComment(), closeChangeSet); p.getComment(), false);
if (n != null) { if (n != null) {
uploaded = true;
plugin.getDBPOI().deletePOI(p); plugin.getDBPOI().deletePOI(p);
publishProgress(p); publishProgress(p);
} }
@ -79,6 +81,9 @@ public class UploadOpenstreetmapPointAsyncTask
loadErrorsMap.put(point, errorMessage); loadErrorsMap.put(point, errorMessage);
} }
} }
if(uploaded) {
remotepoi.closeChangeSet();
}
return loadErrorsMap; return loadErrorsMap;
} }