Skip to content

Check for null maneuver type in ManeuverView #1429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danesfeder merged 1 commit into from
Oct 16, 2018
Merged

Check for null maneuver type in ManeuverView #1429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...c/main/java/com/mapbox/services/android/navigation/ui/v5/instruction/InstructionView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 5 additions & 1 deletion .../java/com/mapbox/services/android/navigation/ui/v5/instruction/maneuver/ManeuverView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
Expand Down