Fix lint issues.

iOS/Account/CloudKitAccountViewController.swift

@@ -12,7 +12,7 @@ import Account
 
 enum CloudKitAccountViewControllerError: LocalizedError {
 	case iCloudDriveMissing
-	
+
 	var errorDescription: String? {
 		return NSLocalizedString("Unable to add iCloud Account. Please make sure you have iCloud and iCloud Drive enabled in System Settings.", comment: "Unable to add iCloud Account.")
 	}
@@ -22,14 +22,14 @@ class CloudKitAccountViewController: UITableViewController {
 
 	weak var delegate: AddAccountDismissDelegate?
 	@IBOutlet weak var footerLabel: UILabel!
-	
+
 	override func viewDidLoad() {
 		super.viewDidLoad()
 		setupFooter()
-		
+
 		tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
 	}
-	
+
 	private func setupFooter() {
 		footerLabel.text = NSLocalizedString("NetNewsWire will use your iCloud account to sync your subscriptions across your Mac and iOS devices.", comment: "iCloud")
 	}
@@ -38,22 +38,22 @@ class CloudKitAccountViewController: UITableViewController {
 		dismiss(animated: true, completion: nil)
 		delegate?.dismiss()
 	}
-	
+
 	@IBAction func add(_ sender: Any) {
 		guard FileManager.default.ubiquityIdentityToken != nil else {
 			presentError(CloudKitAccountViewControllerError.iCloudDriveMissing)
 			return
 		}
-		
-		let _ = AccountManager.shared.createAccount(type: .cloudKit)
+
+		_ = AccountManager.shared.createAccount(type: .cloudKit)
 		dismiss(animated: true, completion: nil)
 		delegate?.dismiss()
 	}
-	
+
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
 		return section == 0 ? ImageHeaderView.rowHeight : super.tableView(tableView, heightForHeaderInSection: section)
 	}
-	
+
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView

iOS/Account/FeedbinAccountViewController.swift

@@ -32,7 +32,7 @@ class FeedbinAccountViewController: UITableViewController {
 		activityIndicator.isHidden = true
 		emailTextField.delegate = self
 		passwordTextField.delegate = self
-		
+
 		if let account = account, let credentials = try? account.retrieveCredentials(type: .basic) {
 			actionButton.setTitle(NSLocalizedString("Update Credentials", comment: "Update Credentials"), for: .normal)
 			actionButton.isEnabled = true
@@ -47,7 +47,7 @@ class FeedbinAccountViewController: UITableViewController {
 
 		tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
 	}
-	
+
 	private func setupFooter() {
 		footerLabel.text = NSLocalizedString("Sign in to your Feedbin account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have a Feedbin account?", comment: "Feedbin")
 	}
@@ -55,7 +55,7 @@ class FeedbinAccountViewController: UITableViewController {
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
 		return section == 0 ? ImageHeaderView.rowHeight : super.tableView(tableView, heightForHeaderInSection: section)
 	}
-	
+
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
@@ -69,7 +69,7 @@ class FeedbinAccountViewController: UITableViewController {
 	@IBAction func cancel(_ sender: Any) {
 		dismiss(animated: true, completion: nil)
 	}
-	
+
 	@IBAction func showHidePassword(_ sender: Any) {
 		if passwordTextField.isSecureTextEntry {
 			passwordTextField.isSecureTextEntry = false
@@ -79,21 +79,21 @@ class FeedbinAccountViewController: UITableViewController {
 			showHideButton.setTitle("Show", for: .normal)
 		}
 	}
-	
+
 	@IBAction func action(_ sender: Any) {
 		guard let email = emailTextField.text, let password = passwordTextField.text else {
 			showError(NSLocalizedString("Username & password required.", comment: "Credentials Error"))
 			return
 		}
-		
+
 		// When you fill in the email address via auto-complete it adds extra whitespace
 		let trimmedEmail = email.trimmingCharacters(in: .whitespaces)
-		
+
 		guard account != nil || !AccountManager.shared.duplicateServiceAccount(type: .feedbin, username: trimmedEmail) else {
 			showError(NSLocalizedString("There is already a Feedbin account with that username created.", comment: "Duplicate Error"))
 			return
 		}
-		
+
 		resignFirstResponder()
 		toggleActivityIndicatorAnimation(visible: true)
 		setNavigationEnabled(to: false)
@@ -102,22 +102,22 @@ class FeedbinAccountViewController: UITableViewController {
 		Account.validateCredentials(type: .feedbin, credentials: credentials) { result in
 			self.toggleActivityIndicatorAnimation(visible: false)
 			self.setNavigationEnabled(to: true)
-			
+
 			switch result {
 			case .success(let credentials):
 				if let credentials = credentials {
 					if self.account == nil {
 						self.account = AccountManager.shared.createAccount(type: .feedbin)
 					}
-					
+
 					do {
-						
+
 						do {
 							try self.account?.removeCredentials(type: .basic)
 						} catch {}
 						try self.account?.storeCredentials(credentials)
-						
-						self.account?.refreshAll() { result in
+
+						self.account?.refreshAll { result in
 							switch result {
 							case .success:
 								break
@@ -125,7 +125,7 @@ class FeedbinAccountViewController: UITableViewController {
 								self.presentError(error)
 							}
 						}
-						
+
 						self.dismiss(animated: true, completion: nil)
 						self.delegate?.dismiss()
 					} catch {
@@ -137,32 +137,31 @@ class FeedbinAccountViewController: UITableViewController {
 			case .failure:
 				self.showError(NSLocalizedString("Network error. Try again later.", comment: "Credentials Error"))
 			}
-			
+
 		}
 	}
-	
+
 	@IBAction func signUpWithProvider(_ sender: Any) {
 		let url = URL(string: "https://feedbin.com/signup")!
 		let safari = SFSafariViewController(url: url)
 		safari.modalPresentationStyle = .currentContext
 		self.present(safari, animated: true, completion: nil)
 	}
-	
-	
+
 	@objc func textDidChange(_ note: Notification) {
-		actionButton.isEnabled = !(emailTextField.text?.isEmpty ?? false) && !(passwordTextField.text?.isEmpty ?? false) 
+		actionButton.isEnabled = !(emailTextField.text?.isEmpty ?? false) && !(passwordTextField.text?.isEmpty ?? false)
 	}
-	
+
 	private func showError(_ message: String) {
 		presentError(title: NSLocalizedString("Error", comment: "Credentials Error"), message: message)
 	}
-	
-	private func setNavigationEnabled(to value:Bool){
+
+	private func setNavigationEnabled(to value: Bool) {
 		cancelBarButtonItem.isEnabled = value
 		actionButton.isEnabled = value
 	}
-	
-	private func toggleActivityIndicatorAnimation(visible value: Bool){
+
+	private func toggleActivityIndicatorAnimation(visible value: Bool) {
 		activityIndicator.isHidden = !value
 		if value {
 			activityIndicator.startAnimating()
@@ -170,11 +169,11 @@ class FeedbinAccountViewController: UITableViewController {
 			activityIndicator.stopAnimating()
 		}
 	}
-		
+
 }
 
 extension FeedbinAccountViewController: UITextFieldDelegate {
-	
+
 	func textFieldShouldReturn(_ textField: UITextField) -> Bool {
 		if textField == emailTextField {
 			passwordTextField.becomeFirstResponder()
@@ -184,5 +183,5 @@ extension FeedbinAccountViewController: UITextFieldDelegate {
 		}
 		return true
 	}
-	
+
 }

iOS/Account/LocalAccountViewController.swift

@@ -13,7 +13,7 @@ class LocalAccountViewController: UITableViewController {
 
 	@IBOutlet weak var nameTextField: UITextField!
 	@IBOutlet weak var footerLabel: UILabel!
-	
+
 	weak var delegate: AddAccountDismissDelegate?
 
 	override func viewDidLoad() {
@@ -23,7 +23,7 @@ class LocalAccountViewController: UITableViewController {
 		nameTextField.delegate = self
 		tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
 	}
-	
+
 	private func setupFooter() {
 		footerLabel.text = NSLocalizedString("Local accounts do not sync your feeds across devices.", comment: "Local")
 	}
@@ -31,18 +31,18 @@ class LocalAccountViewController: UITableViewController {
 	@IBAction func cancel(_ sender: Any) {
 		dismiss(animated: true, completion: nil)
 	}
-	
+
 	@IBAction func add(_ sender: Any) {
 		let account = AccountManager.shared.createAccount(type: .onMyMac)
 		account.name = nameTextField.text
 		dismiss(animated: true, completion: nil)
 		delegate?.dismiss()
 	}
-	
+
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
 		return section == 0 ? ImageHeaderView.rowHeight : super.tableView(tableView, heightForHeaderInSection: section)
 	}
-	
+
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
@@ -52,14 +52,14 @@ class LocalAccountViewController: UITableViewController {
 			return super.tableView(tableView, viewForHeaderInSection: section)
 		}
 	}
-	
+
 }
 
 extension LocalAccountViewController: UITextFieldDelegate {
-	
+
 	func textFieldShouldReturn(_ textField: UITextField) -> Bool {
 		textField.resignFirstResponder()
 		return true
 	}
-	
+
 }

iOS/Account/NewsBlurAccountViewController.swift

@@ -46,7 +46,7 @@ class NewsBlurAccountViewController: UITableViewController {
 
 		tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
 	}
-	
+
 	private func setupFooter() {
 		footerLabel.text = NSLocalizedString("Sign in to your NewsBlur account and sync your feeds across your devices. Your username and password will be encrypted and stored in Keychain.\n\nDon’t have a NewsBlur account?", comment: "NewsBlur")
 	}
@@ -93,7 +93,7 @@ class NewsBlurAccountViewController: UITableViewController {
 			showError(NSLocalizedString("There is already a NewsBlur account with that username created.", comment: "Duplicate Error"))
 			return
 		}
-		
+
 		let password = passwordTextField.text ?? ""
 
 		startAnimatingActivityIndicator()
@@ -122,7 +122,7 @@ class NewsBlurAccountViewController: UITableViewController {
 						try self.account?.storeCredentials(basicCredentials)
 						try self.account?.storeCredentials(sessionCredentials)
 
-						self.account?.refreshAll() { result in
+						self.account?.refreshAll { result in
 							switch result {
 							case .success:
 								break
@@ -145,7 +145,7 @@ class NewsBlurAccountViewController: UITableViewController {
 
 		}
 	}
-	
+
 	@IBAction func signUpWithProvider(_ sender: Any) {
 		let url = URL(string: "https://newsblur.com")!
 		let safari = SFSafariViewController(url: url)

iOS/Account/ReaderAPIAccountViewController.swift

@@ -27,7 +27,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 	weak var account: Account?
 	var accountType: AccountType?
 	weak var delegate: AddAccountDismissDelegate?
-	
+
     override func viewDidLoad() {
         super.viewDidLoad()
 		setupFooter()
@@ -35,7 +35,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 		activityIndicator.isHidden = true
 		usernameTextField.delegate = self
 		passwordTextField.delegate = self
-		
+
 		if let unwrappedAccount = account,
 		   let credentials = try? retrieveCredentialsForAccount(for: unwrappedAccount) {
 			actionButton.setTitle(NSLocalizedString("Update Credentials", comment: "Update Credentials"), for: .normal)
@@ -45,7 +45,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 		} else {
 			actionButton.setTitle(NSLocalizedString("Add Account", comment: "Add Account"), for: .normal)
 		}
-		
+
 		if let unwrappedAccountType = accountType {
 			switch unwrappedAccountType {
 			case .freshRSS:
@@ -61,14 +61,14 @@ class ReaderAPIAccountViewController: UITableViewController {
 				title = ""
 			}
 		}
-		
+
 		NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: usernameTextField)
 		NotificationCenter.default.addObserver(self, selector: #selector(textDidChange(_:)), name: UITextField.textDidChangeNotification, object: passwordTextField)
 
 		tableView.register(ImageHeaderView.self, forHeaderFooterViewReuseIdentifier: "SectionHeader")
-		
+
     }
-	
+
 	private func setupFooter() {
 		switch accountType {
 			case .bazQux:
@@ -87,11 +87,11 @@ class ReaderAPIAccountViewController: UITableViewController {
 				return
 		}
 	}
-	
+
 	override func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
 		return section == 0 ? ImageHeaderView.rowHeight : super.tableView(tableView, heightForHeaderInSection: section)
 	}
-	
+
 	override func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
 		if section == 0 {
 			let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: "SectionHeader") as! ImageHeaderView
@@ -101,7 +101,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 			return super.tableView(tableView, viewForHeaderInSection: section)
 		}
 	}
-	
+
 	override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
 		switch section {
 		case 0:
@@ -115,8 +115,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 			return 1
 		}
 	}
-	
-	
+
 	@IBAction func cancel(_ sender: Any) {
 		dismiss(animated: true, completion: nil)
 	}
@@ -130,19 +129,19 @@ class ReaderAPIAccountViewController: UITableViewController {
 			showHideButton.setTitle("Show", for: .normal)
 		}
 	}
-	
+
 	@IBAction func action(_ sender: Any) {
 		guard validateDataEntry(), let type = accountType else {
 			return
 		}
-		
+
 		let username = usernameTextField.text!
 		let password = passwordTextField.text!
 		let url = apiURL()!
-		
+
 		// When you fill in the email address via auto-complete it adds extra whitespace
 		let trimmedUsername = username.trimmingCharacters(in: .whitespaces)
-		
+
 		guard account != nil || !AccountManager.shared.duplicateServiceAccount(type: type, username: trimmedUsername) else {
 			showError(NSLocalizedString("There is already an account of that type with that username created.", comment: "Duplicate Error"))
 			return
@@ -167,15 +166,15 @@ class ReaderAPIAccountViewController: UITableViewController {
 
 					do {
 						self.account?.endpointURL = url
-						
+
 						try? self.account?.removeCredentials(type: .readerBasic)
 						try? self.account?.removeCredentials(type: .readerAPIKey)
 						try self.account?.storeCredentials(credentials)
 						try self.account?.storeCredentials(validatedCredentials)
 
 						self.dismiss(animated: true, completion: nil)
-						
-						self.account?.refreshAll() { result in
+
+						self.account?.refreshAll { result in
 							switch result {
 							case .success:
 								break
@@ -183,7 +182,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 								self.showError(NSLocalizedString(error.localizedDescription, comment: "Account Refresh Error"))
 							}
 						}
-						
+
 						self.delegate?.dismiss()
 					} catch {
 						self.showError(NSLocalizedString("Keychain error while storing credentials.", comment: "Credentials Error"))
@@ -197,7 +196,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 
 		}
 	}
-	
+
 	private func retrieveCredentialsForAccount(for account: Account) throws -> Credentials? {
 		switch accountType {
 		case .bazQux, .inoreader, .theOldReader, .freshRSS:
@@ -206,7 +205,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 			return nil
 		}
 	}
-	
+
 	private func headerViewImage() -> UIImage? {
 		if let accountType = accountType {
 			switch accountType {
@@ -224,7 +223,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 		}
 		return nil
 	}
-  
+
 	private func validateDataEntry() -> Bool {
 		switch accountType {
 		case .freshRSS:
@@ -244,7 +243,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 		}
 		return true
 	}
-	
+
 	@IBAction func signUpWithProvider(_ sender: Any) {
 		var url: URL!
 		switch accountType {
@@ -263,7 +262,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 		safari.modalPresentationStyle = .currentContext
 		self.present(safari, animated: true, completion: nil)
 	}
-	
+
 	private func apiURL() -> URL? {
 		switch accountType {
 		case .freshRSS:
@@ -278,9 +277,7 @@ class ReaderAPIAccountViewController: UITableViewController {
 			return nil
 		}
 	}
-	
-	
-	
+
 	@objc func textDidChange(_ note: Notification) {
 		actionButton.isEnabled = !(usernameTextField.text?.isEmpty ?? false)
 	}