Merge pull request ResearchKit#14 from Erin-Mounts/fix_validate_func

Fix validate func
BridgeDigitalHealth · May 3, 2018 · f9a523c · f9a523c
2 parents 7a6e12d + 66b12d4
commit f9a523c
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/ResearchUI/ResearchUI/iOS/Step View Controllers/RSDTableStepViewController.swift b/ResearchUI/ResearchUI/iOS/Step View Controllers/RSDTableStepViewController.swift
@@ -787,11 +787,18 @@ open class RSDTableStepViewController: RSDStepViewController, UITableViewDataSou
     /// Validate the text field value and save the answer if valid.
     @discardableResult
     public func validateAndSave(textField: UITextField? = nil) -> Bool {
-        guard let customTextField = (textField ?? activeTextField) as? RSDStepTextField,
+        // If there isn't an active text field, then return true.
+        guard let textField = (textField ?? activeTextField)
+            else {
+                return true
+        }
+
+        // If the text field is not an RSDStepTextField then return false.
+        guard let customTextField = textField as? RSDStepTextField,
             let indexPath = customTextField.indexPath else {
                 return false
         }
-        
+
         let answer: Any? = {
             if let picker = customTextField.inputView as? RSDPickerViewProtocol {
                 return picker.answer