Merge branch 'develop' into bugfix/issue_1756

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

Author: bilal-alsharifi

.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

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)
+- [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)

VERSION

@@ -1 +1 @@
-RC_5.3.0
+5.3.0

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

android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java

@@ -2454,7 +2454,7 @@ private synchronized boolean bluetoothConnect(BluetoothDevice device) {
     /**
      * 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) {

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

@@ -52,6 +52,7 @@
 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 @@
  * 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 @@ static AddSubMenu subMenuCommandForMenuCell(ISdl internalInterface, MenuCell cel
         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 @@ public void onResponse(int correlationId, RPCResponse response) {
             }
         });
     }
-}
+}

base/src/main/java/com/smartdevicelink/proxy/rpc/SetMediaClockTimer.java

@@ -72,7 +72,7 @@
  * 			<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>

base/src/main/java/com/smartdevicelink/proxy/rpc/Show.java

@@ -534,7 +534,7 @@ public List<SoftButton> getSoftButtons() {
     }
 
     /**
-     * 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

base/src/main/java/com/smartdevicelink/proxy/rpc/SystemCapability.java

@@ -39,7 +39,7 @@
 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 {

base/src/main/java/com/smartdevicelink/session/BaseSdlSession.java

@@ -240,23 +240,26 @@ protected void processControlService(ProtocolMessage msg) {
         // 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");
 
             responseHeader.setQueryID(SecurityQueryID.SEND_INTERNAL_ERROR);
             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);