Skip to content

Conversation

@bilal-alsharifi
Copy link
Contributor

@bilal-alsharifi bilal-alsharifi commented Jun 8, 2021

This PR is not ready for review.

Risk

This PR makes minor API changes.

Testing Plan

  • Full test plan
  • Run all unit tests
  • Additional smoke tests

Summary

See the 5.2.0 Project

Bintray / Gradle:

(These will be updated as seen fit if there are changes)

Android: implementation 'com.smartdevicelink:sdl_android:RC_5.2.0'
JavaSE: implementation 'com.smartdevicelink:sdl_java_se:RC_5.2.0'
JavaEE: implementation 'com.smartdevicelink:sdl_java_ee:RC_5.2.0'

CLA

Julian Kast and others added 30 commits March 24, 2021 09:41
Add NPE check in BaseChoiceSetManager
Co-authored-by: Henigan <rheniga1@MGC12Z921DLVCG.fbpld77.ford.com>
Co-authored-by: Henigan <rheniga1@MGC12Z921DLVCG.fbpld77.ford.com>
Fix for Two voiceCommands contains the same string
Will only start the listener if the BT device is not null, or in the case where the SDL app is the only app installed.
* Make SdlPSM more robust

Add more checks that will help the PSM churn through bad data to get back on track. Also add a try/catch block for each attempt to prevent any production crashes.

* Overhaul SdlPsm unit tests and add more

* Update base/src/main/java/com/smartdevicelink/transport/SdlPsm.java

Co-authored-by: Julian Kast <Julian.kast@livio.io>

Co-authored-by: Julian Kast <Julian.kast@livio.io>
…sten_during_connection

Allow SdlDeviceListener to start after BT connection
Move exception reporting to debugtool
…n BaseVoiceCommandManger and VoiceCommandUpdateOperation
* Update sending VoiceCommandManager to strip extra whiteSpace from voiceCommands and avoid sending empty strings in the update operation

* Add unit test for empty strings and trimmed whiteSpace for voiceCommands

* update unit test

* Add null unit test check to voiceCommandManager

* Implement suggestions from code review

* Removed null voiceCommands from VoiceCommandList. Update unit test

* Fix suggestions from code review

* Update ID's for voice commands in proper list

* Strip white Space before checking if commands are unique

Co-authored-by: Julian Kast <julian@livio.com>
Julian Kast and others added 17 commits May 25, 2021 14:52
* Add workaround to solve issue 1690

* Add unit tests for the workaround
Fix to avoid deleting and setting identical voice commands
Add onClose callbacks after LCM clean() calls
* Fix Non-Media Sync template bug in BaseSystemCapabilityManager

* Add unit test for sync bug for NON_MEDIA template

Co-authored-by: Julian Kast <julian@livio.com>
…lable into account for uniqueness (#1684)

* BaseChoiceSetManager, Strip away unsupported textFields from choices

* Add image checking to ChoiceSetManager uniqueness check

* MenuManager strip parameters away from uniqueness check if hmi does not support fields

* added logic to check subcells properly

* Add missing !

* Fix copy paste error with naming

* Clone choiceCell when comparing for visual uniqueness

* Clone menuCell when comparing for visual uniqueness

* update comment

* Add check for submenu

* Refactor check for uniqueness

* Add WindowCapability to menuManagerTest

* Change menuCellsAreUnique to package private and add unit test

* Update unit test

* add menuManager test

* Clean up BaseChoiceSetManager logic

* Add more unit test

* Modify menu manger unit test

* Formatting and cleanup of unitTest

* Added logic for : On RPC v7.1+ connections, we will no longer display duplicate menu cells if some property of the cell is different but that property isn't actually displayed on the head unit.

* Remove testing logic that was not meant to be uploaded.

* Fix not checking available ChoiceCell properties

* Add null checks and remove added unitTest,

* Fix subCell logic for MenuCells

* Add unit test to menuManager

* Remove testing code and add unit test for the choiceSetManager

* Update comments/alignment

* remove unused import

Co-authored-by: Julian Kast <julian@livio.com>
…ceived where DismissalEnabled is false (#1699)

* Fix corner case in LockScreenManager

* Update unit tests
Fix MenuManager sending secondary image with menuCells when menuCommandSecondaryImage is not supported
@codecov
Copy link

codecov bot commented Jun 8, 2021

Codecov Report

Merging #1709 (a8d8c73) into master (65c43df) will increase coverage by 0.51%.
The diff coverage is 60.66%.

❗ Current head a8d8c73 differs from pull request most recent head 405d9a4. Consider uploading reports for the commit 405d9a4 to get more accurate results
Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1709      +/-   ##
============================================
+ Coverage     53.94%   54.45%   +0.50%     
- Complexity     5305     5406     +101     
============================================
  Files           555      555              
  Lines         24561    24746     +185     
  Branches       3101     3156      +55     
============================================
+ Hits          13249    13475     +226     
+ Misses        10160    10096      -64     
- Partials       1152     1175      +23     
Impacted Files Coverage Δ
...icelink/transport/MultiplexBluetoothTransport.java 4.26% <0.00%> (-0.03%) ⬇️
...martdevicelink/transport/SdlBroadcastReceiver.java 3.21% <0.00%> (-0.03%) ⬇️
...artdevicelink/transport/utl/SdlDeviceListener.java 10.34% <0.00%> (ø)
...va/com/smartdevicelink/exception/SdlException.java 0.00% <ø> (ø)
...a/com/smartdevicelink/managers/BaseSdlManager.java 49.80% <0.00%> (ø)
...tdevicelink/managers/file/UploadFileOperation.java 68.93% <0.00%> (ø)
...com/smartdevicelink/proxy/rpc/OnSystemRequest.java 43.69% <0.00%> (+1.42%) ⬆️
...va/com/smartdevicelink/transport/SiphonServer.java 7.30% <0.00%> (ø)
...c/main/java/com/smartdevicelink/util/FileUtls.java 0.00% <0.00%> (ø)
...smartdevicelink/managers/file/BaseFileManager.java 65.97% <14.28%> (-0.87%) ⬇️
... and 20 more

Copy link
Contributor

@JulianKast JulianKast left a comment

Choose a reason for hiding this comment

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

Approved, @bilal-alsharifi should review my additions before moving forward.

@bilal-alsharifi
Copy link
Contributor Author

@JulianKast latest changes look good 👌

@bilal-alsharifi bilal-alsharifi merged commit c3553b7 into master Jun 30, 2021
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.

4 participants