From f818b87df76916042a80b7e0041e2e47964ffbf3 Mon Sep 17 00:00:00 2001
From: Julian Kast <julian@livio.com>
Date: Tue, 30 Nov 2021 09:57:11 -0500
Subject: Move keyboard listener to start of operation

---
 .../managers/screen/choiceset/PreloadPresentChoicesOperation.java       | 2 +-
 1 file changed, 1 insertion(+), 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 8c6ebca6f..d46bd3d6a 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,6 +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
@@ -343,7 +344,6 @@ class PreloadPresentChoicesOperation extends Task {
             return;
         }
 
-        addListeners();
 
         if (keyboardListener != null && choiceSet.getCustomKeyboardConfiguration() != null) {
             keyboardProperties = choiceSet.getCustomKeyboardConfiguration();
-- 
cgit v1.2.1