From 8fe43f1f20681d47e2edd2321289f21cf9cc911c Mon Sep 17 00:00:00 2001
From: Julian Kast <julian@livio.com>
Date: Tue, 30 Nov 2021 12:01:47 -0500
Subject: Move adding a keyboard listener to only if its a present operation
 and the keyboard listener is not null

---
 .../managers/screen/choiceset/PreloadPresentChoicesOperation.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 d46bd3d6a..92cb3838b 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
@@ -185,7 +185,7 @@ class PreloadPresentChoicesOperation extends Task {
             choiceId = 1;
             reachedMaxIds = false;
         }
-        addListeners();
+
 
         DebugTool.logInfo(TAG, "Choice Operation: Executing preload choices operation");
         // Enforce unique cells and remove cells that are already loaded
@@ -419,6 +419,10 @@ class PreloadPresentChoicesOperation extends Task {
     }
 
     private void presentChoiceSet(final CompletionListener listener) {
+        // add listeners if there is a keboard
+        if (keyboardListener != null) {
+            addListeners();
+        }
         this.currentState = SDLPreloadPresentChoicesOperationState.PRESENTING_CHOICES;
         PerformInteraction pi = getPerformInteraction();
         pi.setOnRPCResponseListener(new OnRPCResponseListener() {
-- 
cgit v1.2.1