Remove duplicate code from PreloadChoicesOperation

Author: bilal-alsharifi

base/src/main/java/com/smartdevicelink/managers/screen/BaseTextAndGraphicManager.java

@@ -785,22 +785,22 @@ private boolean templateSupportsImageField(ImageFieldName name) {
 	 * @return true if mediaTrackTextField should be updated, false if not
 	 */
 	private boolean shouldUpdateMediaTrackField() {
-		return shouldUpdateField(TextFieldName.mediaTrack);
+		return templateSupportsTextField(TextFieldName.mediaTrack);
 	}
 
 	/**
 	 * Check to see if title should be updated
 	 * @return true if title should be updated, false if not
 	 */
 	private boolean shouldUpdateTitleField() {
-		return shouldUpdateField(TextFieldName.templateTitle);
+		return templateSupportsTextField(TextFieldName.templateTitle);
 	}
 
 	/**
 	 * Check to see if field should be updated
 	 * @return true if field should be updated, false if not
 	 */
-	private boolean shouldUpdateField(TextFieldName name) {
+	private boolean templateSupportsTextField(TextFieldName name) {
 		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getTextFields() != null)
 				? ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name)
 				: true;

base/src/main/java/com/smartdevicelink/managers/screen/choiceset/PreloadChoicesOperation.java

@@ -234,32 +234,34 @@ boolean shouldSendChoiceText() {
 		if (this.displayName != null && this.displayName.equals(DisplayType.GEN3_8_INCH)){
 			return true;
 		}
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getTextFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.menuName)
-				: true;
+		return templateSupportsTextField(TextFieldName.menuName);
 	}
 
 	boolean shouldSendChoiceSecondaryText() {
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getTextFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.secondaryText)
-				: true;
+		return templateSupportsTextField(TextFieldName.secondaryText);
 	}
 
 	boolean shouldSendChoiceTertiaryText() {
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getTextFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, TextFieldName.tertiaryText)
-				: true;
+		return templateSupportsTextField(TextFieldName.tertiaryText);
 	}
 
 	boolean shouldSendChoicePrimaryImage() {
-		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getImageFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.choiceImage)
-				: true;
+		return templateSupportsImageField(ImageFieldName.choiceImage);
 	}
 
 	boolean shouldSendChoiceSecondaryImage() {
+		return templateSupportsImageField(ImageFieldName.choiceSecondaryImage);
+	}
+
+	boolean templateSupportsTextField(TextFieldName name) {
+		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getTextFields() != null)
+				? ManagerUtility.WindowCapabilityUtility.hasTextFieldOfName(defaultMainWindowCapability, name)
+				: true;
+	}
+
+	boolean templateSupportsImageField(ImageFieldName name) {
 		return (defaultMainWindowCapability != null && defaultMainWindowCapability.getImageFields() != null)
-				? ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, ImageFieldName.choiceSecondaryImage)
+				? ManagerUtility.WindowCapabilityUtility.hasImageFieldOfName(defaultMainWindowCapability, name)
 				: true;
 	}