diff --git a/RandomUserSwift/RandomUser.swift b/RandomUserSwift/RandomUser.swift index fdd36ad..5571dca 100644 --- a/RandomUserSwift/RandomUser.swift +++ b/RandomUserSwift/RandomUser.swift @@ -144,38 +144,38 @@ public class RandomUser { if let results = json["results"] as? [[String: AnyObject]] { for result in results { - let gender = result["gender"]! as! String + let gender = result["gender"] as? String ?? "" - let title = result["name"]!["title"]! as! String - let firstName = result["name"]!["first"]! as! String - let lastName = result["name"]!["last"]! as! String + let title = result["name"]?["title"] as? String ?? "" + let firstName = result["name"]?["first"] as? String ?? "" + let lastName = result["name"]?["last"] as? String ?? "" - let street = result["location"]!["street"]! as! String - let city = result["location"]!["city"]! as! String - let state = result["location"]!["state"]! as! String - let zip = Int(result["location"]!["postcode"]! as! NSNumber) + let street = result["location"]?["street"] as? String ?? "" + let city = result["location"]?["city"] as? String ?? "" + let state = result["location"]?["state"] as? String ?? "" + let zip = Int(result["location"]?["postcode"] as? String ?? "") ?? 0 - let email = result["email"]! as! String + let email = result["email"] as? String ?? "" - let username = result["login"]!["username"]! as! String - let password = result["login"]!["password"]! as! String + let username = result["login"]?["username"] as? String ?? "" + let password = result["login"]?["password"] as? String ?? "" - let salt = result["login"]!["salt"]! as! String - let md5 = result["login"]!["md5"]! as! String - let sha1 = result["login"]!["sha1"]! as! String - let sha256 = result["login"]!["sha256"]! as! String + let salt = result["login"]?["salt"] as? String ?? "" + let md5 = result["login"]?["md5"] as? String ?? "" + let sha1 = result["login"]?["sha1"] as? String ?? "" + let sha256 = result["login"]?["sha256"] as? String ?? "" - let dateOfBirth = convertTo(date: result["dob"]! as! String) + let dateOfBirth = convertTo(date: result["dob"] as? String ?? "") - let dateRegistered = convertTo(date: result["registered"]! as! String) + let dateRegistered = convertTo(date: result["registered"] as? String ?? "") - let homePhone = result["phone"]! as! String + let homePhone = result["phone"] as? String ?? "" - let cellPhone = result["cell"]! as! String + let cellPhone = result["cell"] as? String ?? "" - let pictureLargeURL = result["picture"]!["large"]! as! String - let pictureMediumURL = result["picture"]!["medium"]! as! String - let pictureThumbnailURL = result["picture"]!["thumbnail"]! as! String + let pictureLargeURL = result["picture"]?["large"] as? String ?? "" + let pictureMediumURL = result["picture"]?["medium"] as? String ?? "" + let pictureThumbnailURL = result["picture"]?["thumbnail"] as? String ?? "" self.user = User(gender: gender, title: title, firstName: firstName, lastName: lastName, street: street, city: city, state: state, zip: zip, email: email, username: username, password: password, salt: salt, md5: md5, sha1: sha1, sha256: sha256, dateOfBirth: dateOfBirth, dateRegistered: dateRegistered, homePhone: homePhone, cellPhone: cellPhone, pictureLargeURL: pictureLargeURL, pictureMediumURL: pictureMediumURL, pictureThumbnailURL: pictureThumbnailURL) }