Merge pull request #510 from smartdevicelink/bugfix/alert-view-cancel-listener

Fix AlertManager logic for canceling an in-progress alert

Author: renonick87

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()}`);