From a954d3a3378e74092eafde4ab9e17a7edb6777f8 Mon Sep 17 00:00:00 2001 From: Dmitry Donskoy Date: Tue, 9 Apr 2019 12:25:02 +0300 Subject: [PATCH] [android] Changed request codes, changed prepare --- android/src/com/mapswithme/maps/MwmActivity.java | 2 +- .../src/com/mapswithme/maps/routing/RoutingController.java | 2 +- .../com/mapswithme/maps/routing/RoutingPlanController.java | 2 +- .../mapswithme/maps/settings/DrivingOptionsFragment.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index abdcda473c..291c5db94a 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -2266,7 +2266,7 @@ public class MwmActivity extends BaseMwmFragmentActivity @Override public void onAlertDialogPositiveClick(int requestCode, int which) { - if (requestCode == REQ_CODE_DRIVING_OPTIONS) + if (requestCode == REQ_CODE_ERROR_CALCULATE_ROUTE_FIRST_TIME) DrivingOptionsActivity.start(this); } diff --git a/android/src/com/mapswithme/maps/routing/RoutingController.java b/android/src/com/mapswithme/maps/routing/RoutingController.java index c5b7b8545f..a5a3f83678 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingController.java @@ -449,7 +449,7 @@ public class RoutingController implements TaxiManager.TaxiListener public void prepare(@Nullable MapObject startPoint, @Nullable MapObject endPoint) { - prepare(startPoint == null ? LocationHelper.INSTANCE.getMyPosition() : startPoint, endPoint, false); + prepare(startPoint, endPoint, false); } public void prepare(@Nullable MapObject startPoint, @Nullable MapObject endPoint, boolean fromApi) diff --git a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java index fee733f929..951fdb115f 100644 --- a/android/src/com/mapswithme/maps/routing/RoutingPlanController.java +++ b/android/src/com/mapswithme/maps/routing/RoutingPlanController.java @@ -346,7 +346,7 @@ public class RoutingPlanController extends ToolbarController { mDrivingOptionsBtnContainer.addOnLayoutChangeListener(mDriverOptionsLayoutListener); UiUtils.show(mDrivingOptionsBtnContainer); - View image = getToolbar().findViewById(R.id.driving_options_btn_img); + View image = getActivity().findViewById(R.id.driving_options_btn_img); UiUtils.showIf(RoutingOptions.hasAnyOptions(), image); TextView title = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn_title); title.setText(RoutingOptions.hasAnyOptions() ? R.string.change_driving_options_btn diff --git a/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java b/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java index 62916e78b3..c3c580e487 100644 --- a/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java +++ b/android/src/com/mapswithme/maps/settings/DrivingOptionsFragment.java @@ -69,7 +69,7 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment outState.putIntegerArrayList(BUNDLE_ROAD_TYPES, savedRoadTypes); } - private boolean isSameSettingsBeforeAndAfter() + private boolean areSettingsNotChanged() { Set lastActiveRoadTypes = RoutingOptions.getActiveRoadTypes(); return mRoadTypes.containsAll(lastActiveRoadTypes) && lastActiveRoadTypes.containsAll(mRoadTypes); @@ -95,8 +95,8 @@ public class DrivingOptionsFragment extends BaseMwmToolbarFragment { if (item.getItemId() == R.id.done) { - requireActivity().setResult(isSameSettingsBeforeAndAfter() ? Activity.RESULT_CANCELED - : Activity.RESULT_OK); + requireActivity().setResult(areSettingsNotChanged() ? Activity.RESULT_CANCELED + : Activity.RESULT_OK); requireActivity().finish(); return true; }