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

Fix #6780

Browse source
This commit is contained in:
crimean 2019-06-27 16:38:18 +03:00
parent b24c577947
commit 298937cc76
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/routepreparationmenu/AddPointBottomSheetDialog.java
View file

@ -34,6 +34,7 @@ import net.osmand.plus.OsmAndLocationProvider;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.TargetPointsHelper;
import net.osmand.plus.TargetPointsHelper.TargetPoint;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.base.MenuBottomSheetDialogFragment; import net.osmand.plus.base.MenuBottomSheetDialogFragment;
import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem; import net.osmand.plus.base.bottomsheetmenu.BaseBottomSheetItem;
@ -256,6 +257,11 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
targetPointsHelper.setWorkPoint(ll, null); targetPointsHelper.setWorkPoint(ll, null);
break; break;
} }
} else if (pointType == PointType.START) {
if (targetPointsHelper.getPointToStart() != null) {
targetPointsHelper.clearStartPoint(true);
app.getSettings().backupPointToStart();
}
} }
} else if (activity != null) { } else if (activity != null) {
ActivityCompat.requestPermissions(activity, ActivityCompat.requestPermissions(activity,
@ -333,6 +339,11 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
MapActivity mapActivity = (MapActivity) getActivity(); MapActivity mapActivity = (MapActivity) getActivity();
if (mapActivity != null) { if (mapActivity != null) {
TargetPointsHelper targetsHelper = mapActivity.getMyApplication().getTargetPointsHelper(); TargetPointsHelper targetsHelper = mapActivity.getMyApplication().getTargetPointsHelper();
TargetPoint startPoint = targetsHelper.getPointToStart();
if (startPoint == null) {
mapActivity.getMyApplication().showShortToastMessage(R.string.route_add_start_point);
return;
}
WaypointDialogHelper.switchStartAndFinish(targetsHelper, targetsHelper.getPointToNavigate(), WaypointDialogHelper.switchStartAndFinish(targetsHelper, targetsHelper.getPointToNavigate(),
mapActivity, targetsHelper.getPointToStart(), mapActivity.getMyApplication(), mapActivity, targetsHelper.getPointToStart(), mapActivity.getMyApplication(),
mapActivity.getDashboard().getWaypointDialogHelper()); mapActivity.getDashboard().getWaypointDialogHelper());
@ -447,7 +458,7 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
ll = new LatLon(point.getLatitude(), point.getLongitude()); ll = new LatLon(point.getLatitude(), point.getLongitude());
name = point.getPointDescription(); name = point.getPointDescription();
} else if (item instanceof PointType) { } else if (item instanceof PointType) {
TargetPointsHelper.TargetPoint point = null; TargetPoint point = null;
if (item == PointType.HOME) { if (item == PointType.HOME) {
point = helper.getHomePoint(); point = helper.getHomePoint();
} else if (item == PointType.WORK) { } else if (item == PointType.WORK) {
@ -587,7 +598,7 @@ public class AddPointBottomSheetDialog extends MenuBottomSheetDialogFragment {
} else { } else {
if (item instanceof PointType) { if (item instanceof PointType) {
final TargetPointsHelper helper = app.getTargetPointsHelper(); final TargetPointsHelper helper = app.getTargetPointsHelper();
TargetPointsHelper.TargetPoint point = null; TargetPoint point = null;
if (item == PointType.HOME) { if (item == PointType.HOME) {
point = helper.getHomePoint(); point = helper.getHomePoint();
favoriteViewHolder.title.setText(getString(R.string.home_button)); favoriteViewHolder.title.setText(getString(R.string.home_button));