From 5d426b73e71e7d08fe7766831cea541ceb8eb954 Mon Sep 17 00:00:00 2001 From: danesfeder Date: Tue, 16 Oct 2018 16:11:37 -0400 Subject: [PATCH] Check for null maneuver type in ManeuverView --- .../navigation/ui/v5/instruction/InstructionView.java | 4 +++- .../navigation/ui/v5/instruction/maneuver/ManeuverView.java | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java index 85ddb5f80ef..12703e1f01b 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java @@ -695,7 +695,9 @@ private void updateSubStep(BannerText subText) { } private boolean shouldShowSubStep(@Nullable BannerText subText) { - return turnLaneLayout.getVisibility() != VISIBLE && subText != null; + return turnLaneLayout.getVisibility() != VISIBLE + && subText != null + && subText.type() != null; } private void showSubLayout() { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java index 1c34909e4db..cca13051fcc 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java @@ -3,6 +3,7 @@ import android.content.Context; import android.graphics.Canvas; import android.graphics.PointF; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.util.Pair; import android.text.TextUtils; @@ -100,7 +101,7 @@ protected void onFinishInflate() { initManeuverColor(); } - public void setManeuverTypeAndModifier(String maneuverType, String maneuverModifier) { + public void setManeuverTypeAndModifier(@NonNull String maneuverType, String maneuverModifier) { if (isNewTypeOrModifier(maneuverType, maneuverModifier)) { this.maneuverType = maneuverType; this.maneuverModifier = maneuverModifier; @@ -158,6 +159,9 @@ private void initManeuverColor() { } private boolean isNewTypeOrModifier(String maneuverType, String maneuverModifier) { + if (maneuverType == null) { + return false; + } return !TextUtils.equals(this.maneuverType, maneuverType) || !TextUtils.equals(this.maneuverModifier, maneuverModifier); }