Add additional check for non-manadatory parameters #2538
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
requested changes
Aug 30, 2018
| message[strings::msg_params][strings::file_size] = | ||
| (*message_)[strings::msg_params][strings::length]; | ||
| if ((*message_)[strings::msg_params].keyExists(strings::offset)) { | ||
| message[strings::msg_params][strings::offset] = offset_; |
There was a problem hiding this comment.
This assignment is redundant, the same assignment is two lines above
There was a problem hiding this comment.
@jacobkeeler Yes, good point, please take a look b4691c7
| message[strings::msg_params][strings::offset] = offset_; | ||
| if (0 == offset_ && (*message_)[strings::msg_params].keyExists(strings::length)) { | ||
| message[strings::msg_params][strings::file_size] = | ||
| (*message_)[strings::msg_params][strings::length]; |
There was a problem hiding this comment.
Wrong case, this should be set to length_ if 0 == offset_ && !keyExists(strings::length), file_size should not be set if length is sent by the app. This is because if length is provided or offset is nonzero, it means that this is a partial data chunk, which means that you cannot determine the length of the file.
message[strings::msg_params][strings::offset] = offset_;
if (0 == offset_ && !(*message_)[strings::msg_params].keyExists(strings::length)) {
message[strings::msg_params][strings::file_size] = length_;
}
There was a problem hiding this comment.
@jacobkeeler please take a look b4691c7
The OnPutFile notification has non mandatory parameters `fileSize` and `length`. If the mobile application has no provided appropriate parameters SDL sends `fileSize`: null as json value to HMI. The commit fixes the issue and simply remove non mandatory parameter in case mobile app sends nothing for one.
ZhdanovP
force-pushed
the
fix/sdl_does_not_check_for_non_mandatory_parameters
branch
from
08ccbaf
to
b4691c7
Compare
ZhdanovP
requested review from
AByzhynar,
AKalinich-Luxoft,
Itileda,
KVGrygoriev,
mked-luxoft,
IGapchuk and
Ypostolov
AKalinich-Luxoft
approved these changes
Aug 31, 2018
KVGrygoriev
approved these changes
Aug 31, 2018
IGapchuk
approved these changes
Sep 4, 2018
jacobkeeler
approved these changes
Sep 4, 2018
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 #2443
This PR is ready for review.
Risk
This PR makes no API changes.
Testing Plan
ATF script - smartdevicelink/sdl_atf_test_scripts#2020
Summary
The OnPutFile notification has non mandatory parameters
fileSizeandlength. If the mobile application has no providedappropriate parameters SDL sends
fileSize: null as json value to HMI.The commit fixes the issue and simply remove non mandatory parameter in
case mobile app sends nothing for one.
Tasks Remaining:
CLA