Stop validation fall through for Reader API adds/edits

This commit is contained in:
Maurice Parker 2020-10-27 14:45:21 -05:00
parent 1035fd7b76
commit 2edd558139
1 changed files with 8 additions and 6 deletions

View File

@ -109,8 +109,9 @@ class ReaderAPIAccountViewController: UITableViewController {
}
@IBAction func action(_ sender: Any) {
validateDataEntry()
guard validateDataEntry() else {
return
}
let username = usernameTextField.text!
let password = passwordTextField.text!
@ -201,23 +202,24 @@ class ReaderAPIAccountViewController: UITableViewController {
return nil
}
private func validateDataEntry() {
private func validateDataEntry() -> Bool {
switch accountType {
case .freshRSS:
if !usernameTextField.hasText || !passwordTextField.hasText || !apiURLTextField.hasText {
showError(NSLocalizedString("Username, password, and API URL are required.", comment: "Credentials Error"))
return
return false
}
guard let _ = URL(string: apiURLTextField.text!) else {
showError(NSLocalizedString("Invalid API URL.", comment: "Invalid API URL"))
return
return false
}
default:
if !usernameTextField.hasText || !passwordTextField.hasText {
showError(NSLocalizedString("Username and password are required.", comment: "Credentials Error"))
return
return false
}
}
return true
}
private func apiURL() -> URL? {