Skip to content

Fix MapWayname ProgressChangeListener leak #1442

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 23, 2018
Merged

Fix MapWayname ProgressChangeListener leak #1442

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
11 changes: 11 additions & 0 deletions ...igation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/MapWayname.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class MapWayname {
private MapPaddingAdjustor paddingAdjustor;
private List<Point> currentStepPoints = new ArrayList<>();
private Location currentLocation = null;
private MapboxNavigation navigation;
private final MapWaynameProgressChangeListener progressChangeListener = new MapWaynameProgressChangeListener(this);
private boolean isAutoQueryEnabled;
private boolean isVisible;
Expand Down Expand Up @@ -95,13 +96,23 @@ String retrieveWayname() {
}

void addProgressChangeListener(MapboxNavigation navigation) {
this.navigation = navigation;
navigation.addProgressChangeListener(progressChangeListener);
}

void onStart() {
if (navigation != null) {
navigation.addProgressChangeListener(progressChangeListener);
}
}

void onStop() {
if (isTaskRunning()) {
filterTask.cancel(true);
}
if (navigation != null) {
navigation.removeProgressChangeListener(progressChangeListener);
}
}

private List<Feature> findRoadLabelFeatures(PointF point) {
Expand Down
1 change: 1 addition & 0 deletions ...i/src/main/java/com/mapbox/services/android/navigation/ui/v5/map/NavigationMapboxMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@ public void onStart() {
locationLayer.onStart();
mapCamera.onStart();
mapRoute.onStart();
mapWayname.onStart();
}

/**
Expand Down