Skip to content
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

Jump to bottom

Fix #6788: enable QR pairing for china edition #6811

Merged
merged 1 commit into from Jun 18, 2020
Merged

Fix #6788: enable QR pairing for china edition #6811

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions Client/Frontend/Browser/BrowserViewController.swift
View file
Open in desktop
Expand Up @@ -2117,9 +2117,7 @@ extension BrowserViewController {
object = .settings
}

let signInVC = AppInfo.isChinaEdition ?
FxAWebViewController(pageType: .emailLoginFlow, profile: profile, dismissalStyle: .dismiss, deepLinkParams: deepLinkParams) :
FirefoxAccountSignInViewController(profile: profile, parentType: parentType, deepLinkParams: deepLinkParams)
let signInVC = FirefoxAccountSignInViewController(profile: profile, parentType: parentType, deepLinkParams: deepLinkParams)
UnifiedTelemetry.recordEvent(category: .firefoxAccount, method: .view, object: object)
return signInVC
}
Expand Down
8 changes: 2 additions & 6 deletions Client/Frontend/Settings/AppSettingsOptions.swift
View file
Open in desktop
Expand Up @@ -47,9 +47,7 @@ class ConnectSetting: WithoutAccountSetting {
override var accessibilityIdentifier: String? { return "SignInToSync" }

override func onClick(_ navigationController: UINavigationController?) {
let viewController = AppInfo.isChinaEdition ?
FxAWebViewController(pageType: .emailLoginFlow, profile: profile, dismissalStyle: .popToRootVC, deepLinkParams: nil) :
FirefoxAccountSignInViewController(profile: profile, parentType: .settings, deepLinkParams: nil)
let viewController = FirefoxAccountSignInViewController(profile: profile, parentType: .settings, deepLinkParams: nil)
UnifiedTelemetry.recordEvent(category: .firefoxAccount, method: .view, object: .settings)
navigationController?.pushViewController(viewController, animated: true)
}
Expand Down Expand Up @@ -340,9 +338,7 @@ class AccountStatusSetting: WithAccountSetting {

override func onClick(_ navigationController: UINavigationController?) {
guard !profile.rustFxA.accountNeedsReauth() else {
let vc = AppInfo.isChinaEdition ?
FxAWebViewController(pageType: .emailLoginFlow, profile: profile, dismissalStyle: .popToRootVC, deepLinkParams: nil) :
FirefoxAccountSignInViewController(profile: profile, parentType: .settings, deepLinkParams: nil)
let vc = FirefoxAccountSignInViewController(profile: profile, parentType: .settings, deepLinkParams: nil)
UnifiedTelemetry.recordEvent(category: .firefoxAccount, method: .view, object: .settings)
navigationController?.pushViewController(vc, animated: true)
return
Expand Down