pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fix NPE in MwmActivity.showStartPointNotice()

Browse source 
Reproduces when the back and start buttons are pressed at the same time.

Fixes #6628

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2023-12-06 08:27:03 +02:00
parent a295b7a8b2
commit 58e99345a2
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/app/src/main/java/app/organicmaps/MwmActivity.java
View file

@ -1674,6 +1674,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
final RoutingController controller = RoutingController.get();
if (showAddStartOrFinishFrame(controller, true))
return false;
// Starting and ending points must be non-null, see {@link #showAddStartOrFinishFrame() }.
final MapObject startPoint = Objects.requireNonNull(controller.getStartPoint());
if (startPoint.isMyPosition())
@ -1705,7 +1708,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
Logger.d(LOCATION_TAG, "newMode = " + LocationState.nameOf(newMode));
mMapButtonsViewModel.setMyPositionMode(newMode);
RoutingController controller = RoutingController.get();
if (controller.isPlanning())
if (controller.isPlanning() || controller.isBuilding() || controller.isErrorEncountered())
showAddStartOrFinishFrame(controller, true);
if (newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE)

5
android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
View file

@ -284,7 +284,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
{
mStart.setText(mContext.getText(R.string.p2p_start));
mStart.setOnClickListener(v -> {
if (mListener != null)
// Ignore the event if the back and start buttons are pressed at the same time.
// See {@link #RoutingPlanController.onUpClick()}.
// https://github.com/organicmaps/organicmaps/issues/6628
if (mListener != null && RoutingController.get().isPlanning())
mListener.onRoutingStart();
});
}

4
android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
View file

@ -165,6 +165,10 @@ public class RoutingPlanController extends ToolbarController
@Override
public void onUpClick()
{
// Ignore the event if the back and start buttons are pressed at the same time.
// See {@link #RoutingBottomMenuController.setStartButton()}.
if (RoutingController.get().isNavigating())
return;
RoutingController.get().cancel();
}