Merge pull request smartdevicelink#513 from smartdevicelink/master

Merge master into develop

Author: crokita

examples/node/hello-sdl/AppClient.js

@@ -105,11 +105,11 @@ class AppClient {
         this._isButtonSubscriptionRequested = false;
     }
 
-    _onConnected () {
+    async _onConnected () {
         this._managersReady = true;
         this._checkReadyState();
         const screenManager = this._sdlManager.getScreenManager();
-        
+
         // add menus
         const menuListener = new SDL.manager.screen.menu.MenuSelectionListener()
             .setOnTriggered(triggerSource => {

lib/js/src/manager/screen/_ScreenManagerBase.js

@@ -77,6 +77,10 @@ class _ScreenManagerBase extends _SubManagerBase {
             this._choiceSetManagerBase.start(),
             this._menuManagerBase.start(),
         ]);
+
+        _ScreenManagerBase._softButtonIDBySoftButtonManager = new Set();
+        _ScreenManagerBase._softButtonIDByAlertManager = new Set();
+
         this._transitionToState(_SubManagerBase.READY);
         await super.start();
     }
@@ -743,9 +747,6 @@ _ManagerLocation._MAP = Object.freeze({
 
 _ScreenManagerBase._ManagerLocation = _ManagerLocation;
 
-_ScreenManagerBase._softButtonIDBySoftButtonManager = new Set();
-_ScreenManagerBase._softButtonIDByAlertManager = new Set();
-
 const SOFT_BUTTON_ID_NOT_SET_VALUE = -1;
 const SOFT_BUTTON_ID_MIN_VALUE = 0;
 const SOFT_BUTTON_ID_MAX_VALUE = 10000;

lib/js/src/manager/screen/_TextAndGraphicUpdateOperation.js

@@ -66,8 +66,8 @@ class _TextAndGraphicUpdateOperation extends _Task {
      * The method that causes the task to run.
      * @param {_Task} task - The task instance
      */
-    onExecute (task) {
-        this._start();
+    async onExecute (task) {
+        await this._start();
     }
     /**
      * If the task is not canceled, starts to assemble the show

lib/js/src/manager/screen/choiceset/_PreloadPresentChoicesOperation.js

@@ -468,7 +468,7 @@ class _PreloadPresentChoicesOperation extends _Task {
             console.error('PreloadChoicesOperation: Error uploading choice cell artworks');
         }
 
-        return uploadResults.includes(false);
+        return !uploadResults.includes(false);
     }
 
     /**
@@ -710,14 +710,15 @@ class _PreloadPresentChoicesOperation extends _Task {
             return;
         }
 
+        // detach the OnKeyboardInput listener at the end
+        this._lifecycleManager.removeRpcListener(FunctionID.OnKeyboardInput, this._keyboardRpcListener);
+
         if (this._updatedKeyboardProperties) {
             this._currentState = _PreloadPresentChoicesOperationState.RESETTING_KEYBOARD_PROPERTIES;
             // We need to reset the keyboard properties
             const setGlobalProperties = new SetGlobalProperties()
                 .setKeyboardProperties(this._originalKeyboardProperties);
 
-            // detach the OnKeyboardInput listener at the end
-            this._lifecycleManager.removeRpcListener(FunctionID.OnKeyboardInput, this._keyboardRpcListener);
             const response = await this._lifecycleManager.sendRpcResolve(setGlobalProperties);
 
             if (response.getSuccess()) {

lib/js/src/manager/screen/menu/_MenuConfigurationUpdateOperation.js

@@ -53,8 +53,8 @@ class _MenuConfigurationUpdateOperation extends _Task {
      * The method that causes the task to run.
      * @param {_Task} task - The task instance
      */
-    onExecute (task) {
-        this._start();
+    async onExecute (task) {
+        await this._start();
     }
 
     /**

lib/js/src/manager/screen/menu/_MenuManagerBase.js

@@ -303,7 +303,7 @@ class _MenuManagerBase extends _SubManagerBase {
     _updateMenuReplaceOperationsWithNewCurrentMenu () {
         this._taskQueue.forEach(task => {
             if (task.getName() === 'MenuReplaceOperation') {
-                task.setCurrentMenu(this._currentMenuCells);
+                task._setCurrentMenu(this._currentMenuCells);
             }
         });
     }
@@ -325,7 +325,7 @@ class _MenuManagerBase extends _SubManagerBase {
     _updateMenuReplaceOperationsWithNewMenuConfiguration () {
         this._taskQueue.forEach(task => {
             if (task.getName() === 'MenuReplaceOperation') {
-                task.setMenuConfiguration(this._currentMenuConfiguration);
+                task._setMenuConfiguration(this._currentMenuConfiguration);
             }
         });
     }

lib/js/src/manager/screen/menu/_MenuReplaceOperation.js

@@ -67,8 +67,8 @@ class _MenuReplaceOperation extends _Task {
      * The method that causes the task to run.
      * @param {_Task} task - The task instance
      */
-    onExecute (task) {
-        this._start();
+    async onExecute (task) {
+        await this._start();
     }
 
     /**

lib/js/src/manager/screen/menu/_MenuReplaceUtilities.js

@@ -342,6 +342,10 @@ class _MenuReplaceUtilities {
         const shouldCellIncludeSecondaryImage = cell.getSecondaryArtwork() !== null && cell.getSecondaryArtwork().getImageRPC() !== null && _MenuReplaceUtilities.shouldCellIncludeSecondaryImageFromCell(cell, fileManager, windowCapability);
         const secondaryIcon = shouldCellIncludeSecondaryImage ? cell.getSecondaryArtwork().getImageRPC() : null;
 
+        if (Array.isArray(cell.getVoiceCommands()) && cell.getVoiceCommands().length > 0) {
+            console.warn('MenuManagerBase - Setting voice commands for submenu cells is not supported. The voice commands will not be set.');
+        }
+
         let submenuLayout = null;
         const availableMenuLayouts = windowCapability !== null ? windowCapability.getMenuLayoutsAvailable() : null;
         if (cell.getSubMenuLayout() !== null && availableMenuLayouts !== null && availableMenuLayouts.includes(cell.getSubMenuLayout())) {

lib/js/src/manager/screen/menu/_MenuShowOperation.js

@@ -49,8 +49,8 @@ class _MenuShowOperation extends _Task {
      * The method that causes the task to run.
      * @param {_Task} task - The task instance
      */
-    onExecute (task) {
-        this._start();
+    async onExecute (task) {
+        await this._start();
     }
 
     /**

lib/js/src/manager/screen/utils/_PresentAlertOperation.js

@@ -64,9 +64,10 @@ class _PresentAlertOperation extends _Task {
         this._isAlertPresented = false;
         this._alertSoftButtonClearListener = alertSoftButtonClearListener;
 
-        this._alertView.canceledListener = function () {
+        this._alertView.canceledListener = () => {
             this.cancelAlert();
         };
+        alertView.canceledListener = this._alertView.canceledListener;
     }
 
     /**
@@ -257,7 +258,7 @@ class _PresentAlertOperation extends _Task {
      */
     async cancelAlert () {
         if (this.getState() === _Task.FINISHED) {
-            console.logInfo('This operation has already finished so it can not be canceled');
+            console.log('This operation has already finished so it can not be canceled');
             return;
         } else if (this.getState() === _Task.CANCELED) {
             console.log('This operation has already been canceled. It will be finished at some point during the operation.');
@@ -266,12 +267,17 @@ class _PresentAlertOperation extends _Task {
             if (this._lifecycleManager !== null && this._lifecycleManager.getSdlMsgVersion() !== null && this._lifecycleManager.getSdlMsgVersion().getMajorVersion() < 6) {
                 console.log('Attempting to cancel this operation in-progress; if the alert is already presented on the module, it cannot be dismissed.');
                 this.switchStates(_Task.CANCELED);
+                return;
             } else if (!this._isAlertPresented) {
                 console.log('Alert has not yet been sent to the module. Alert will not be shown.');
+                this.switchStates(_Task.CANCELED);
+                return;
             }
             console.log('Canceling the presented alert');
 
-            const cancelInteraction = new CancelInteraction(FunctionID.Alert, this._cancelId);
+            const cancelInteraction = new CancelInteraction()
+                .setFunctionIDParam(FunctionID.Alert)
+                .setCancelID(this._cancelId);
             const response = await this._lifecycleManager.sendRpcResolve(cancelInteraction);
             if (!response.getSuccess()) {
                 console.log(`Error canceling the presented alert: ${response.getInfo()}`);