diff options
author | Robert Henigan <robert.henigan@livio.io> | 2021-12-08 16:07:34 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-08 16:07:34 -0500 |
commit | ad72c3384c966c089b4058bfa14da9cc32a1c694 (patch) | |
tree | 359d66046a1d0501ae53d9de0362729459d64e08 | |
parent | 0bda03437ed79d1e4890060ff9a816db3ccd5251 (diff) | |
parent | 7c8995bcf8d3433b3b5834599f2cf541e51a99b8 (diff) | |
download | sdl_android-ad72c3384c966c089b4058bfa14da9cc32a1c694.tar.gz |
Merge pull request #1773 from smartdevicelink/hotfix/5.3.15.3.1
Hotfix/5.3.1
-rw-r--r-- | CHANGELOG.md | 43 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | android/sdl_android/gradle.properties | 2 | ||||
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java | 2 | ||||
-rw-r--r-- | base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java | 6 | ||||
-rw-r--r-- | javaEE/javaEE/gradle.properties | 2 | ||||
-rw-r--r-- | javaSE/javaSE/gradle.properties | 2 | ||||
-rw-r--r-- | javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java | 2 |
8 files changed, 14 insertions, 47 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d760b0d1..c5a689a7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 5.3.0 Release Notes +# 5.3.1 Release Notes ## Summary: ||Version| @@ -7,45 +7,8 @@ | **RPC** | 8.0.0 | **Tested Targeting** | Android 30 - -## Features: - -- [[SDL 0293] Enable OEM exclusive apps support](https://github.com/smartdevicelink/sdl_java_suite/issues/1588) - ## Bug Fixes / Enhancements: -- [New TaskMaster release needs to be added to Java Suite Library ](https://github.com/smartdevicelink/sdl_java_suite/issues/1745) - -- [File Manager will upload the same file multiple times](https://github.com/smartdevicelink/sdl_java_suite/issues/1736) - -- [Fix description for `SeatControlCapabilities` and `RadioControlCapabilities`](https://github.com/smartdevicelink/sdl_java_suite/issues/1739) - -- [AudioStreamManager and AlertManager have the same queue ID](https://github.com/smartdevicelink/sdl_java_suite/issues/1742) - -- [java.lang.IndexOutOfBoundsException Crash: SdlRouterService.java line 3275 ](https://github.com/smartdevicelink/sdl_java_suite/issues/1741) - -- [Old devices with SDL 2.0 can't display text fields and SoftButtons](https://github.com/smartdevicelink/sdl_java_suite/issues/1729) - -- [Swapping de-duplicated menu items causes incorrect unique titles](https://github.com/smartdevicelink/sdl_java_suite/issues/1723) - -- [MenuCell title update issue](https://github.com/smartdevicelink/sdl_java_suite/issues/1651) - -- [Refactor the Menu Manager to Use Queues ](https://github.com/smartdevicelink/sdl_java_suite/issues/1605) - -- [Security queries are not implemented to spec](https://github.com/smartdevicelink/sdl_java_suite/issues/1720) - -- [Choice Set Present followed directly by a Delete can have undefined behavior](https://github.com/smartdevicelink/sdl_java_suite/issues/1718) - -- [Back-to-back choice sets can fail](https://github.com/smartdevicelink/sdl_java_suite/issues/1717) - -- [Github CI fails even though tests pass locally ](https://github.com/smartdevicelink/sdl_java_suite/issues/1731) - -- [Handler instances using deprecated constructors ](https://github.com/smartdevicelink/sdl_java_suite/issues/1696) - -- [[SDL 0236] Update mismatch in TireStatus structure](https://github.com/smartdevicelink/sdl_java_suite/issues/1089) - -- [Choices not saved as preloaded if some choices fail](https://github.com/smartdevicelink/sdl_java_suite/issues/1715) - -- [MenuManager should print warning when trying to send AddSubMenu with voice commands](https://github.com/smartdevicelink/sdl_java_suite/issues/1760) +- [userDidSubmitInput getting called multiple times after a search request is submitted](https://github.com/smartdevicelink/sdl_java_suite/issues/1768) -- [Spelling/ Grammar Updates](https://github.com/smartdevicelink/sdl_java_suite/issues/1754)
\ No newline at end of file +- [NPE in SoftButtonReplaceOperation](https://github.com/smartdevicelink/sdl_java_suite/issues/1767) @@ -1 +1 @@ -5.3.0 +5.3.1 diff --git a/android/sdl_android/gradle.properties b/android/sdl_android/gradle.properties index d93b695d2..3137d38b9 100644 --- a/android/sdl_android/gradle.properties +++ b/android/sdl_android/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.smartdevicelink POM_ARTIFACT_ID=sdl_android -VERSION_NAME=5.3.0 +VERSION_NAME=5.3.1 POM_NAME=sdl_android POM_PACKAGING=aar diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java index e2611a959..c6578ff2e 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/SoftButtonReplaceOperation.java @@ -304,7 +304,7 @@ class SoftButtonReplaceOperation extends Task { } private boolean supportsSoftButtonImages() { - return softButtonCapabilities.getImageSupported(); + return softButtonCapabilities != null && Boolean.TRUE.equals(softButtonCapabilities.getImageSupported()); } void setCurrentMainField1(String currentMainField1) { diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java index 8c6ebca6f..91a32ea0b 100644 --- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java +++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadPresentChoicesOperation.java @@ -186,6 +186,7 @@ class PreloadPresentChoicesOperation extends Task { reachedMaxIds = false; } + DebugTool.logInfo(TAG, "Choice Operation: Executing preload choices operation"); // Enforce unique cells and remove cells that are already loaded this.cellsToUpload.removeAll(loadedCells); @@ -343,7 +344,6 @@ class PreloadPresentChoicesOperation extends Task { return; } - addListeners(); if (keyboardListener != null && choiceSet.getCustomKeyboardConfiguration() != null) { keyboardProperties = choiceSet.getCustomKeyboardConfiguration(); @@ -419,6 +419,10 @@ class PreloadPresentChoicesOperation extends Task { } private void presentChoiceSet(final CompletionListener listener) { + // add listeners if there is a keyboard + if (keyboardListener != null) { + addListeners(); + } this.currentState = SDLPreloadPresentChoicesOperationState.PRESENTING_CHOICES; PerformInteraction pi = getPerformInteraction(); pi.setOnRPCResponseListener(new OnRPCResponseListener() { diff --git a/javaEE/javaEE/gradle.properties b/javaEE/javaEE/gradle.properties index 6f84e23f1..a7af0f36b 100644 --- a/javaEE/javaEE/gradle.properties +++ b/javaEE/javaEE/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.smartdevicelink POM_ARTIFACT_ID=sdl_java_ee -VERSION_NAME=5.3.0 +VERSION_NAME=5.3.1 POM_NAME=sdl_java_ee POM_PACKAGING=jar diff --git a/javaSE/javaSE/gradle.properties b/javaSE/javaSE/gradle.properties index a9e29ea87..f2a4bb0f9 100644 --- a/javaSE/javaSE/gradle.properties +++ b/javaSE/javaSE/gradle.properties @@ -1,6 +1,6 @@ GROUP=com.smartdevicelink POM_ARTIFACT_ID=sdl_java_se -VERSION_NAME=5.3.0 +VERSION_NAME=5.3.1 POM_NAME=sdl_java_se POM_PACKAGING=jar diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java index 51add4ed2..9b4ce8fca 100644 --- a/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java +++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java @@ -32,5 +32,5 @@ package com.smartdevicelink; // THIS FILE IS AUTO GENERATED, DO NOT MODIFY!! public final class BuildConfig { - public static final String VERSION_NAME = "5.3.0"; + public static final String VERSION_NAME = "5.3.1"; }
\ No newline at end of file |