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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-11-15 20:48:44 +01:00
commit 840ed41b4d
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
View file

@ -416,7 +416,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
} else {
title = R.string.osn_add_dialog_title;
}
AlertDialog dlg = (AlertDialog) dialog;
final AlertDialog dlg = (AlertDialog) dialog;
dlg.setTitle(title);
final View view = dlg.findViewById(R.id.layout);
Button btn = dlg.getButton(DialogInterface.BUTTON_POSITIVE);
@ -447,8 +447,9 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
// AccessibleToast.makeText(activity, activity.getString(R.string.osb_author_or_password_not_specified),
// Toast.LENGTH_SHORT).show();
// }
asyncActionTask(bug, text, action);
activity.getContextMenu().close();
asyncActionTask(bug, text, action);
dlg.dismiss();
}
}
});
@ -456,13 +457,10 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
private Dialog createBugDialog(final Bundle args) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle("");
builder.setTitle(R.string.shared_string_commit);
final View view = activity.getLayoutInflater().inflate(R.layout.open_bug, null);
view.setId(R.id.layout);
builder.setView(view);
builder.setNegativeButton(R.string.shared_string_cancel, null);
builder.setPositiveButton(R.string.shared_string_commit, null);
return builder.create();

4
OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLocalUtil.java
View file

@ -32,13 +32,13 @@ public class OsmBugsLocalUtil implements OsmBugsUtil {
OsmBugResult s = new OsmBugResult();
s.local = p;
s.warning = success ? null : "";
return null;
return s;
}
@Override
public OsmBugResult reopenBug(double latitude, double longitude, long id, String text){
OsmNotesPoint p = new OsmNotesPoint();
p.setId(Math.min(-2, db.getMinID() -1));
p.setId(id);
p.setText(text);
p.setLatitude(latitude);
p.setLongitude(longitude);