diff --git a/android/src/app/organicmaps/MwmActivity.java b/android/src/app/organicmaps/MwmActivity.java index 5edc39d4ca..3e0a973f44 100644 --- a/android/src/app/organicmaps/MwmActivity.java +++ b/android/src/app/organicmaps/MwmActivity.java @@ -1581,7 +1581,7 @@ public class MwmActivity extends BaseMwmFragmentActivity } @Override - public void onShowDisclaimer() + public void onShowDisclaimer(@Nullable MapObject startPoint, @Nullable MapObject endPoint) { final StringBuilder builder = new StringBuilder(); for (int resId : new int[] { R.string.dialog_routing_disclaimer_priority, R.string.dialog_routing_disclaimer_precision, @@ -1596,7 +1596,7 @@ public class MwmActivity extends BaseMwmFragmentActivity .setNegativeButton(R.string.decline, null) .setPositiveButton(R.string.accept, (dlg, which) -> { Config.acceptRoutingDisclaimer(); - RoutingController.get().prepare(); + RoutingController.get().prepare(startPoint, endPoint); }) .show(); } diff --git a/android/src/app/organicmaps/routing/RoutingController.java b/android/src/app/organicmaps/routing/RoutingController.java index 7a4e0498f2..dc2af0485a 100644 --- a/android/src/app/organicmaps/routing/RoutingController.java +++ b/android/src/app/organicmaps/routing/RoutingController.java @@ -67,7 +67,7 @@ public class RoutingController implements Initializable default boolean isSubwayEnabled() { return false; } default void onCommonBuildError(int lastResultCode, @NonNull String[] lastMissingMaps) {} default void onDrivingOptionsBuildError() {} - default void onShowDisclaimer() {} + default void onShowDisclaimer(@Nullable MapObject startPoint, @Nullable MapObject endPoint) {} default void onSuggestRebuildRoute() {} /** @@ -164,7 +164,7 @@ public class RoutingController implements Initializable private final Framework.RoutingLoadPointsListener mRoutingLoadPointsListener = success -> { if (success) - prepare(); + prepare(getStartPoint(), getEndPoint()); }; public static RoutingController get() @@ -353,11 +353,6 @@ public class RoutingController implements Initializable prepare(getStartPoint(), getEndPoint(), false); } - public void prepare() - { - prepare(getStartPoint(), getEndPoint()); - } - public void prepare(@Nullable MapObject startPoint, @Nullable MapObject endPoint) { prepare(startPoint, endPoint, false); @@ -370,7 +365,7 @@ public class RoutingController implements Initializable if (!Config.isRoutingDisclaimerAccepted()) { if (mContainer != null) - mContainer.onShowDisclaimer(); + mContainer.onShowDisclaimer(startPoint, endPoint); return; }