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

Merge pull request #616 from krabaey/feature-save-imported

Browse source 
Keep name of imported file when saving gpx track
This commit is contained in:
vshcherb 2014-05-01 22:40:30 +02:00
commit 3ea4ece705
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -297,7 +297,7 @@ public class MapActivityActions implements DialogProvider {
mapActivity.showDialog(DIALOG_SAVE_DIRECTIONS);
}
public static Dialog createSaveDirections(Activity activity) {
public static Dialog createSaveDirections(Activity activity, RoutingHelper routingHelper) {
final OsmandApplication app = ((OsmandApplication) activity.getApplication());
final File fileDir = app.getAppPath(IndexConstants.GPX_INDEX_DIR);
final Dialog dlg = new Dialog(activity);
@ -305,7 +305,15 @@ public class MapActivityActions implements DialogProvider {
dlg.setContentView(R.layout.save_directions_dialog);
final EditText edit = (EditText) dlg.findViewById(R.id.FileNameEdit);
edit.setText("_" + MessageFormat.format("{0,date,yyyy-MM-dd}", new Date()) + "_");
final GPXRouteParamsBuilder rp = routingHelper.getCurrentGPXRoute();
final String editText;
if (rp == null || rp.getFile() == null || rp.getFile().path == null) {
editText = "_" + MessageFormat.format("{0,date,yyyy-MM-dd}", new Date()) + "_";
} else {
editText = new File(rp.getFile().path).getName();
}
edit.setText(editText);
((Button) dlg.findViewById(R.id.Save)).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -582,7 +590,7 @@ public class MapActivityActions implements DialogProvider {
case DIALOG_RELOAD_TITLE:
return createReloadTitleDialog(args);
case DIALOG_SAVE_DIRECTIONS:
return createSaveDirections(mapActivity);
return createSaveDirections(mapActivity, mapActivity.getRoutingHelper());
}
return OsmAndDialogs.createDialog(id, mapActivity, args);
}

2
OsmAnd/src/net/osmand/plus/activities/ShowRouteInfoActivity.java
View file

@ -58,7 +58,7 @@ public class ShowRouteInfoActivity extends OsmandListActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == SAVE) {
MapActivityActions.createSaveDirections(ShowRouteInfoActivity.this).show();
MapActivityActions.createSaveDirections(ShowRouteInfoActivity.this, helper).show();
return true;
}
return super.onOptionsItemSelected(item);