Merge branch 'master' into develop

5 files changed, 11 insertions, 44 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)
diff --git a/VERSION b/VERSION
index 03f488b07..c7cb1311a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.3.0
+5.3.1
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/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