Browse Source

streamline error handling

B. Petersen 5 years ago
parent
commit
ca1b1df6cf

+ 2 - 7
DcCore/DcCore/DC/Wrapper.swift

@@ -154,13 +154,8 @@ public class DcContext {
         return DcLot(dc_check_qr(contextPointer, qrCode))
     }
 
-    public func configureAccountFromQR(qrCode: String) -> Bool {
-        let state = checkQR(qrCode: qrCode).state
-        if state != DC_QR_ACCOUNT {
-            return false
-        }
-        let success = dc_set_config_from_qr(contextPointer, qrCode)
-        return success == 1
+    public func setConfigFromQR(qrCode: String) -> Bool {
+        return dc_set_config_from_qr(contextPointer, qrCode) != 0
     }
 
     public func stopOngoingProcess() {

+ 1 - 11
deltachat-ios/Controller/WelcomeViewController.swift

@@ -125,7 +125,7 @@ class WelcomeViewController: UIViewController, ProgressAlertHandler {
         guard let code = scannedQrCode else {
             return
         }
-        let success = dcContext.configureAccountFromQR(qrCode: code)
+        let success = dcContext.setConfigFromQR(qrCode: code)
         scannedQrCode = nil
         if success {
             addProgressAlertListener(onSuccess: handleLoginSuccess)
@@ -197,17 +197,7 @@ extension WelcomeViewController: QrCodeReaderDelegate {
                 self.qrCordeReader.startSession()
             }
         )
-        let qrCancelAction = UIAlertAction(
-             title: String.localized("cancel"),
-             style: .cancel,
-             handler: { [unowned self] _ in
-                 self.qrCodeReaderNav.dismiss(animated: true) {
-                     self.scannedQrCode = nil
-                 }
-             }
-         )
         alert.addAction(okAction)
-        alert.addAction(qrCancelAction)
         qrCodeReaderNav.present(alert, animated: true, completion: nil)
     }
 }