Skip to content

Bugfix/issue 1835 AlertManager File upload fix#1836

Merged
JulianKast merged 13 commits intodevelopfrom
bugfix/issue_1835
Sep 23, 2022
Merged

Bugfix/issue 1835 AlertManager File upload fix#1836
JulianKast merged 13 commits intodevelopfrom
bugfix/issue_1835

Conversation

@JulianKast
Copy link
Contributor

@JulianKast JulianKast commented Sep 19, 2022

Fixes #1835

This PR is [ready] for review.

Risk

This PR makes [no] API changes.

Testing Plan

  • I have verified that I have not introduced new warnings in this PR (or explain why below)
  • I have run the unit tests with this PR
  • I have tested this PR against Core and verified behavior (if applicable, if not applicable, explain why below).
  • I have tested Android, Java SE, and Java EE

Unit Tests

Unit test were updated in PresentAlertOperationTest.

Core Tests

Test sending Alert with Image via ScreenManager and verify that the image correctly appears.

Core version / branch / commit hash / module tested against: Manticore
HMI name / version / branch / commit hash / module tested against: Manticore

Summary

Changed check fileManager.hasUploadedFile to fileManager.fileNeedsUpload.

Changelog

Bug Fixes
  • Fixes incorrect conditional statement when creating AlertRPC so Images will appear correctly

CLA

@JulianKast JulianKast changed the base branch from master to develop September 19, 2022 20:55
@codecov
Copy link

codecov bot commented Sep 19, 2022

Codecov Report

Merging #1836 (425e9f6) into develop (b99a2ca) will increase coverage by 0.01%.
The diff coverage is 51.64%.

❗ Current head 425e9f6 differs from pull request most recent head 8479e86. Consider uploading reports for the commit 8479e86 to get more accurate results

Impacted file tree graph

@@              Coverage Diff              @@
##             develop    #1836      +/-   ##
=============================================
+ Coverage      54.04%   54.05%   +0.01%     
- Complexity      5532     5537       +5     
=============================================
  Files            562      562              
  Lines          25821    25869      +48     
  Branches        3398     3415      +17     
=============================================
+ Hits           13954    13983      +29     
- Misses         10596    10605       +9     
- Partials        1271     1281      +10     
Impacted Files Coverage Δ
...martdevicelink/transport/SdlBroadcastReceiver.java 3.02% <ø> (ø)
...tdevicelink/transport/SdlRouterStatusProvider.java 0.00% <0.00%> (ø)
...link/transport/USBAccessoryAttachmentActivity.java 0.00% <0.00%> (ø)
...managers/screen/TextAndGraphicUpdateOperation.java 70.88% <51.42%> (-0.27%) ⬇️
...ink/managers/screen/BaseTextAndGraphicManager.java 63.29% <61.53%> (-0.88%) ⬇️
...icelink/managers/screen/PresentAlertOperation.java 58.62% <70.00%> (+2.67%) ⬆️
...anagers/lifecycle/BaseSystemCapabilityManager.java 67.76% <75.00%> (+0.08%) ⬆️
...nk/managers/audio/AudioDecoderCompatOperation.java 75.00% <0.00%> (-4.55%) ⬇️

Copy link
Contributor

@ChloeMJM ChloeMJM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove unused imports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Images not displaying correctly on Alerts sent via AlertManager

2 participants