Check waypoint subscription size in resumption #3684
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jacobkeeler
approved these changes
Apr 8, 2021
| @@ -131,14 +131,19 @@ void SDLRPCPlugin::RevertResumption(application_manager::Application& app) { | |||
| pending_resumption_handler_->OnResumptionRevert(); | |||
|
|
|||
| if (application_manager_->IsAppSubscribedForWayPoints(app)) { | |||
| application_manager_->UnsubscribeAppFromWayPoints(app.app_id()); | |||
| if (!application_manager_->IsAnyAppSubscribedForWayPoints()) { | |||
| std::set<uint32_t> subscribed_apps = | |||
There was a problem hiding this comment.
@JackLivio probably good place for const auto
| if (!application_manager_->IsAnyAppSubscribedForWayPoints()) { | ||
| std::set<uint32_t> subscribed_apps = | ||
| application_manager_->GetAppsSubscribedForWayPoints(); | ||
| bool send_unsubscribe = subscribed_apps.size() <= 1 && |
There was a problem hiding this comment.
@JackLivio const bool?
There was a problem hiding this comment.
@JackLivio do we really need to check "less than one"?
Suggested change
| bool send_unsubscribe = subscribed_apps.size() <= 1 && | |
| bool send_unsubscribe = subscribed_apps.size() == 1 && |
There was a problem hiding this comment.
@AKalinich-Luxoft Updated the modifiers, but I would suggest keeping <= for "safety".
AKalinich-Luxoft
approved these changes
Apr 9, 2021
jacobkeeler
approved these changes
Apr 9, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3683
This PR is ready for review.
Risk
This PR makes no API changes.
Testing Plan
See reproduction steps in issue #3683
Summary
Check size of waypoint subscription list before unsubscribing HMI from way points.
CLA