fix present keyboard global properties

5 files changed, 9 insertions, 8 deletions

diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/operations/PreloadChoicesOperationTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/operations/PreloadChoicesOperationTests.java
index 59e257d7b..f8f67eee0 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/operations/PreloadChoicesOperationTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/managers/screen/choiceset/operations/PreloadChoicesOperationTests.java
@@ -38,6 +38,7 @@ import com.smartdevicelink.AndroidTestCase2;
 import com.smartdevicelink.managers.file.FileManager;
 import com.smartdevicelink.managers.screen.choiceset.ChoiceCell;
 import com.smartdevicelink.proxy.interfaces.ISdl;
+import com.smartdevicelink.proxy.rpc.CreateInteractionChoiceSet;
 import com.smartdevicelink.proxy.rpc.DisplayCapabilities;
 import com.smartdevicelink.proxy.rpc.ImageField;
 import com.smartdevicelink.proxy.rpc.TextField;
@@ -104,10 +105,6 @@ public class PreloadChoicesOperationTests extends AndroidTestCase2 {
 		assertTrue(test);
 	}
 
-	public void testCreateInteractionChoiceSet(){
 
 
-
-	}
-
 }
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
index d78977b74..51a293122 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/BaseChoiceSetManager.java
@@ -339,7 +339,11 @@ abstract class BaseChoiceSetManager extends BaseSubManager {
         }
 
         if (customKeyboardConfig == null){
-            customKeyboardConfig = defaultKeyboardConfiguration();
+            if (this.keyboardConfiguration != null){
+                customKeyboardConfig = this.keyboardConfiguration;
+            } else {
+                customKeyboardConfig = defaultKeyboardConfiguration();
+            }
         }
 
         // Present a keyboard with the choice set that we used to test VR's optional state
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PreloadChoicesOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PreloadChoicesOperation.java
index 43efbd2bd..bc98d0fcc 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PreloadChoicesOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PreloadChoicesOperation.java
@@ -67,10 +67,10 @@ public class PreloadChoicesOperation implements Runnable {
 	private WeakReference<ISdl> internalInterface;
 	private WeakReference<FileManager> fileManager;
 	private DisplayCapabilities displayCapabilities;
-	private Boolean isVROptional;
 	private HashSet<ChoiceCell> cellsToUpload;
 	private CompletionListener completionListener;
 	private boolean isRunning;
+	Boolean isVROptional;
 
 	public PreloadChoicesOperation(ISdl internalInterface, FileManager fileManager, DisplayCapabilities displayCapabilities,
 								   Boolean isVROptional, HashSet<ChoiceCell> cellsToPreload, CompletionListener listener){
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PresentChoiceSetOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PresentChoiceSetOperation.java
index 14524e62b..5c6635d88 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PresentChoiceSetOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PresentChoiceSetOperation.java
@@ -297,7 +297,7 @@ public class PresentChoiceSetOperation implements Runnable {
 		if (internalInterface.get() != null) {
 			internalInterface.get().addOnRPCNotificationListener(FunctionID.ON_KEYBOARD_INPUT, keyboardRPCListener);
 		} else {
-			DebugTool.logError("Present Choice Keyboard Listener Not Added");
+			DebugTool.logError("Present Choice Set Keyboard Listener Not Added");
 		}
 	}
 }
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PresentKeyboardOperation.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PresentKeyboardOperation.java
index 4e484bfc1..dfc131c07 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PresentKeyboardOperation.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/operations/PresentKeyboardOperation.java
@@ -238,7 +238,7 @@ public class PresentKeyboardOperation implements Runnable {
 		if (internalInterface.get() != null) {
 			internalInterface.get().addOnRPCNotificationListener(FunctionID.ON_KEYBOARD_INPUT, keyboardRPCListener);
 		} else {
-			DebugTool.logError("Present Choice Keyboard Listener Not Added");
+			DebugTool.logError("Present Keyboard Listener Not Added - choice manager");
 		}
 	}
 }
\ No newline at end of file