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

support DC_QR_BACKUP2 #2263

Merged
merged 1 commit into from
Aug 10, 2024
Merged

support DC_QR_BACKUP2 #2263

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deltachat-ios/Controller/AccountSetup/WelcomeViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class WelcomeViewController: UIViewController {
extension WelcomeViewController: QrCodeReaderDelegate {
func handleQrCode(_ code: String) {
let lot = dcContext.checkQR(qrCode: code)
if lot.state == DC_QR_BACKUP {
if lot.state == DC_QR_BACKUP || lot.state == DC_QR_BACKUP2 {
confirmSetupNewDevice(qrCode: code)
} else {
qrErrorAlert()
Expand Down
2 changes: 1 addition & 1 deletion deltachat-ios/Controller/QrPageController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ extension QrPageController: QrCodeReaderDelegate {
}))
present(alert, animated: true, completion: nil)

case DC_QR_BACKUP:
case DC_QR_BACKUP, DC_QR_BACKUP2:
// alert is shown in WelcomeViewController
guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else { return }
_ = dcAccounts.add()
Expand Down
2 changes: 1 addition & 1 deletion deltachat-ios/Coordinator/AppCoordinator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ class AppCoordinator: NSObject {

if let accountCode {
let qr = dcAccounts.getSelected().checkQR(qrCode: accountCode)
if qr.state == DC_QR_BACKUP {
if qr.state == DC_QR_BACKUP || qr.state == DC_QR_BACKUP2 {
viewControllers = [WelcomeViewController(dcAccounts: dcAccounts, accountCode: accountCode)]
} else {
viewControllers = [
Expand Down
Loading