From 8faa2c3a7123c7120368e84e54c06b1d3004c78c Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Wed, 18 Oct 2017 21:43:36 -0600 Subject: [PATCH 1/2] Fix crash when dismissing Google signin view --- .../Classes/ViewRelated/NUX/LoginEmailViewController.swift | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift index 235958803ebe..2c233fb005eb 100644 --- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift @@ -451,9 +451,10 @@ extension LoginEmailViewController { } extension LoginEmailViewController: GIDSignInDelegate { - func sign(_ signIn: GIDSignIn!, didSignInFor user: GIDGoogleUser!, withError error: Error!) { + func sign(_ signIn: GIDSignIn?, didSignInFor user: GIDGoogleUser?, withError error: Error?) { // TODO: finish implementing wpcom login via Google code - guard let token = user.authentication.idToken, + guard let user = user, + let token = user.authentication.idToken, let email = user.profile.email else { // The Google SignIn for may have been canceled. //TODO: Add analytis From 1274f21df74584bd1e27dcb5cf3e370d59aed161 Mon Sep 17 00:00:00 2001 From: Nate Heagy Date: Thu, 19 Oct 2017 23:00:20 -0600 Subject: [PATCH 2/2] align some let statements in LoginEmailViewController --- .../Classes/ViewRelated/NUX/LoginEmailViewController.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift index 2c233fb005eb..aaf35781a9b4 100644 --- a/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift +++ b/WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift @@ -454,8 +454,8 @@ extension LoginEmailViewController: GIDSignInDelegate { func sign(_ signIn: GIDSignIn?, didSignInFor user: GIDGoogleUser?, withError error: Error?) { // TODO: finish implementing wpcom login via Google code guard let user = user, - let token = user.authentication.idToken, - let email = user.profile.email else { + let token = user.authentication.idToken, + let email = user.profile.email else { // The Google SignIn for may have been canceled. //TODO: Add analytis return