Merge branch 'develop' into bugfix/issue_1756

# Conflicts:
#	base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java

15 files changed, 28 insertions, 15 deletions

diff --git a/.gitmodules b/.gitmodules
index d2f68e804..cd0213164 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "generator/rpc_spec"]
 	path = generator/rpc_spec
 	url = https://github.com/smartdevicelink/rpc_spec.git
-	branch = version/8.0.0
+	branch = master
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7692ed29..9d760b0d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,4 +44,8 @@
 
 - [[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)
\ No newline at end of file
+- [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)
+
+- [Spelling/ Grammar Updates](https://github.com/smartdevicelink/sdl_java_suite/issues/1754)
\ No newline at end of file
diff --git a/VERSION b/VERSION
index 5a2442574..03f488b07 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-RC_5.3.0
+5.3.0
diff --git a/android/sdl_android/gradle.properties b/android/sdl_android/gradle.properties
index 44ca7bd1b..d93b695d2 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=RC_5.3.0
+VERSION_NAME=5.3.0
 
 POM_NAME=sdl_android
 POM_PACKAGING=aar
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
index bcabc9546..9d24ddfec 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java
@@ -2454,7 +2454,7 @@ public class SdlRouterService extends Service {
     /**
      * Set the connection establishment status of the particular device
      *
-     * @param address         address of the device in quesiton
+     * @param address         address of the device in question
      * @param hasSDLConnected true if a connection has been established, false if not
      */
     protected void setSDLConnectedStatus(String address, boolean hasSDLConnected) {
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
index a49aec232..dcec8d19f 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/menu/MenuReplaceUtilities.java
@@ -52,6 +52,7 @@ import com.smartdevicelink.proxy.rpc.enums.ImageFieldName;
 import com.smartdevicelink.proxy.rpc.enums.MenuLayout;
 import com.smartdevicelink.proxy.rpc.enums.TextFieldName;
 import com.smartdevicelink.proxy.rpc.listeners.OnMultipleRequestListener;
+import com.smartdevicelink.util.DebugTool;
 import com.smartdevicelink.util.Version;
 
 import java.util.ArrayList;
@@ -65,6 +66,7 @@ import java.util.Set;
  * Created by Bilal Alsharifi on 1/25/21.
  */
 class MenuReplaceUtilities {
+    private static final String TAG = "MenuReplaceUtilities";
     private static int menuId = 0;
 
     static int getNextMenuId() {
@@ -294,6 +296,10 @@ class MenuReplaceUtilities {
         boolean shouldCellIncludeSecondaryImage = cell.getSecondaryArtwork() != null && cell.getSecondaryArtwork().getImageRPC() != null && shouldCellIncludeSecondaryImageFromCell(cell, fileManager, windowCapability);
         Image secondaryIcon = (shouldCellIncludeSecondaryImage ? cell.getSecondaryArtwork().getImageRPC() : null);
 
+        if (cell.getVoiceCommands() != null && !cell.getVoiceCommands().isEmpty()) {
+            DebugTool.logWarning(TAG, "Setting voice commands for submenu cells is not supported. The voice commands will not be set.");
+        }
+
         MenuLayout submenuLayout;
         List<MenuLayout> availableMenuLayouts = windowCapability != null ? windowCapability.getMenuLayoutsAvailable() : null;
         if (cell.getSubMenuLayout() != null && availableMenuLayouts != null && availableMenuLayouts.contains(cell.getSubMenuLayout())) {
@@ -438,4 +444,4 @@ class MenuReplaceUtilities {
             }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
index 60b9c524f..099224638 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java
@@ -72,7 +72,7 @@ import java.util.Hashtable;
  * 			<td>endTime</td>

  * 			<td>StartTime</td>

  * 			<td> EndTime can be provided for "COUNTUP" and "COUNTDOWN"; to be used to calculate any visual progress bar (if not provided, this feature is ignored)

- * If endTime is greater then startTime for COUNTDOWN or less than startTime for COUNTUP, then the request will return an INVALID_DATA.

+ * If endTime is greater than startTime for COUNTDOWN or less than startTime for COUNTUP, then the request will return an INVALID_DATA.

  * endTime will be ignored for "RESUME", and "CLEAR"

  * endTime can be sent for "PAUSE", in which case it will update the paused endTime</td>

  *                 <td>N</td>

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
index 5962a04fd..e9bdcd905 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java
@@ -534,7 +534,7 @@ public class Show extends RPCRequest {
     }

 

     /**

-     * Sets the the Soft buttons defined by the App

+     * Sets the Soft buttons defined by the App

      *

      * @param softButtons a List value representing the Soft buttons defined by the

      *                    App

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
index e930bf533..c39ef4703 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java
@@ -39,7 +39,7 @@ import com.smartdevicelink.proxy.rpc.enums.SystemCapabilityType;
 import java.util.Hashtable;
 
 /**
- * Struct that indicates the a SystemCapabilityType and houses different structs to describe particular capabilities
+ * Struct that indicates the SystemCapabilityType and houses different structs to describe particular capabilities
  */
 
 public class SystemCapability extends RPCStruct {
diff --git a/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java b/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java
index d68e9cd20..5fcc8d8ca 100644
--- a/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java
+++ b/base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java
@@ -240,6 +240,7 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ
         // Assemble a security query payload header for our response
         SecurityQueryPayload responseHeader = new SecurityQueryPayload();
 
+        byte[] returnBytes;
         if (iNumBytes == null || iNumBytes <= 0) {
             DebugTool.logError(TAG, "Internal Error processing control service");
 
@@ -247,16 +248,18 @@ public abstract class BaseSdlSession implements ISdlProtocol, ISecurityInitializ
             responseHeader.setQueryType(SecurityQueryType.NOTIFICATION);
             responseHeader.setCorrelationID(msg.getCorrID());
             responseHeader.setJsonSize(0);
+            returnBytes = new byte[12];
         } else {
             responseHeader.setQueryID(SecurityQueryID.SEND_HANDSHAKE_DATA);
             responseHeader.setQueryType(SecurityQueryType.RESPONSE);
             responseHeader.setCorrelationID(msg.getCorrID());
             responseHeader.setJsonSize(0);
+            returnBytes = new byte[iNumBytes + 12];
+            System.arraycopy(dataToRead, 0, returnBytes, 12, iNumBytes);
         }
 
-        byte[] returnBytes = new byte[iNumBytes + 12];
+
         System.arraycopy(responseHeader.assembleHeaderBytes(), 0, returnBytes, 0, 12);
-        System.arraycopy(dataToRead, 0, returnBytes, 12, iNumBytes);
 
         ProtocolMessage protocolMessage = new ProtocolMessage();
         protocolMessage.setSessionType(SessionType.CONTROL);
diff --git a/base/src/main/java/com/smartdevicelink/util/BitConverter.java b/base/src/main/java/com/smartdevicelink/util/BitConverter.java
index 94695802f..df507d6fe 100644
--- a/base/src/main/java/com/smartdevicelink/util/BitConverter.java
+++ b/base/src/main/java/com/smartdevicelink/util/BitConverter.java
@@ -163,7 +163,7 @@ public class BitConverter {
      * Converts the byte array into a string of hex values.

      *

      * @param bytes byte array that will be converted to hex

-     * @param end   EXCLUSIVE so if it it receives 10 it will print 0-9

+     * @param end   EXCLUSIVE so if it receives 10 it will print 0-9

      * @return the String containing converted hex values or null if byte array is null

      */

     public static String bytesToHex(byte[] bytes, int end) {

diff --git a/generator/rpc_spec b/generator/rpc_spec
-Subproject 20d64e68e1a2af630ac9f33888c971573bcebdd
+Subproject 6537500b45f65e02d884da9d73d6820ba7b0b1f
diff --git a/javaEE/javaEE/gradle.properties b/javaEE/javaEE/gradle.properties
index 70cd4e63f..6f84e23f1 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=RC_5.3.0
+VERSION_NAME=5.3.0
 
 POM_NAME=sdl_java_ee
 POM_PACKAGING=jar
diff --git a/javaSE/javaSE/gradle.properties b/javaSE/javaSE/gradle.properties
index 9c0a0ca96..a9e29ea87 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=RC_5.3.0
+VERSION_NAME=5.3.0
 
 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 206310779..51add4ed2 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 = "RC_5.3.0";
+    public static final String VERSION_NAME = "5.3.0";
 }
\ No newline at end of file