Skip to content

Login: fix crash when dismissing Google view #8012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nheagy merged 2 commits into from
Oct 20, 2017
Merged

Login: fix crash when dismissing Google view #8012

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8faa2c3
Fix crash when dismissing Google signin view
nheagy Oct 19, 2017
1274f21
align some let statements in LoginEmailViewController
nheagy Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions WordPress/Classes/ViewRelated/NUX/LoginEmailViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,10 +451,11 @@ 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,
let email = user.profile.email else {
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
return
Expand Down