kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[MAPSME-5811] [ios] Fixed crash on aborted facebook authorization.

Browse source
This commit is contained in:
Ilya Grechuhin 2017-10-27 10:56:37 +03:00 • committed by r.kuznetsov
parent cdfc1f602a
commit 246ac82146
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
iphone/Maps/UI/Authorization/AuthorizationViewController.swift
View file

@ -121,19 +121,21 @@ final class AuthorizationViewController: MWMViewController {
Statistics.logEvent(kStatUGCReviewAuthDeclined)
dismiss(animated: true, completion: {
(UIApplication.shared.keyWindow?.rootViewController as?
UINavigationController)?.popToRootViewController(animated: true)
UINavigationController)?.popToRootViewController(animated: true)
})
}
private func process(error: Error, type: MWMSocialTokenType) {
Statistics.logEvent(kStatUGCReviewAuthError, withParameters: [kStatProvider : type == .facebook ? kStatFacebook : kStatGoogle,
kStatError : error.localizedDescription])
Statistics.logEvent(kStatUGCReviewAuthError, withParameters: [
kStatProvider: type == .facebook ? kStatFacebook : kStatGoogle,
kStatError: error.localizedDescription,
])
textLabel.text = L("profile_authorization_error")
Crashlytics.sharedInstance().recordError(error)
}
private func process(token: String, type: MWMSocialTokenType) {
Statistics.logEvent(kStatUGCReviewAuthExternalRequestSuccess, withParameters: [kStatProvider : type == .facebook ? kStatFacebook : kStatGoogle])
Statistics.logEvent(kStatUGCReviewAuthExternalRequestSuccess, withParameters: [kStatProvider: type == .facebook ? kStatFacebook : kStatGoogle])
ViewModel.authenticate(withToken: token, type: type)
dismiss(animated: true, completion: completion)
}
@ -143,8 +145,8 @@ extension AuthorizationViewController: FBSDKLoginButtonDelegate {
func loginButton(_: FBSDKLoginButton!, didCompleteWith result: FBSDKLoginManagerLoginResult!, error: Error!) {
if let error = error {
process(error: error, type: .facebook)
} else if let result = result {
process(token: result.token.tokenString, type: .facebook)
} else if let token = result.token {
process(token: token.tokenString, type: .facebook)
}
}