Merge pull request #101 from Adamant-im/dev/fix_qr_crash

StanislavDevIOS · web-flow · commit a2ef4a6e4728 · 2022-09-01T14:05:54.000+03:00
Fixed QR camera crash on first launch
diff --git a/Adamant/Stories/Chats/NewChatViewController.swift b/Adamant/Stories/Chats/NewChatViewController.swift
@@ -366,19 +366,15 @@ extension NewChatViewController {
         case .authorized:
             qrReader.modalPresentationStyle = .overFullScreen
             present(qrReader, animated: true, completion: nil)
-            
         case .notDetermined:
             AVCaptureDevice.requestAccess(for: .video) { [weak self] (granted: Bool) in
-                if granted, let qrReader = self?.qrReader {
-                    qrReader.modalPresentationStyle = .overFullScreen
-                    DispatchQueue.onMainAsync {
+                DispatchQueue.onMainAsync {
+                    if granted, let qrReader = self?.qrReader {
+                        qrReader.modalPresentationStyle = .overFullScreen
                         self?.present(qrReader, animated: true, completion: nil)
                     }
-                } else {
-                    return
                 }
             }
-            
         case .restricted:
             let alert = UIAlertController(title: nil, message: String.adamantLocalized.login.cameraNotSupported, preferredStyle: .alert)
             alert.addAction(UIAlertAction(title: String.adamantLocalized.alert.ok, style: .cancel, handler: nil))
diff --git a/Adamant/Wallets/TransferViewControllerBase+QR.swift b/Adamant/Wallets/TransferViewControllerBase+QR.swift
@@ -26,16 +26,13 @@ extension TransferViewControllerBase {
             
         case .notDetermined:
             AVCaptureDevice.requestAccess(for: .video) { [weak self] (granted: Bool) in
-                if granted, let qrReader = self?.qrReader {
-                    qrReader.modalPresentationStyle = .overFullScreen
-                    DispatchQueue.onMainAsync {
+                DispatchQueue.onMainAsync {
+                    if granted, let qrReader = self?.qrReader {
+                        qrReader.modalPresentationStyle = .overFullScreen
                         self?.present(qrReader, animated: true, completion: nil)
                     }
-                } else {
-                    return
                 }
             }
-            
         case .restricted:
             let alert = UIAlertController(title: nil, message: String.adamantLocalized.login.cameraNotSupported, preferredStyle: .alert)
             alert.addAction(UIAlertAction(title: String.adamantLocalized.alert.ok, style: .cancel, handler: nil))

Original file line number	Diff line number	Diff line change
`@@ -26,16 +26,13 @@ extension TransferViewControllerBase {`
`26`	`26`
`27`	`27`	`case .notDetermined:`
`28`	`28`	`AVCaptureDevice.requestAccess(for: .video) { [weak self] (granted: Bool) in`
`29`		`- if granted, let qrReader = self?.qrReader {`
`30`		`- qrReader.modalPresentationStyle = .overFullScreen`
`31`		`- DispatchQueue.onMainAsync {`
	`29`	`+ DispatchQueue.onMainAsync {`
	`30`	`+ if granted, let qrReader = self?.qrReader {`
	`31`	`+ qrReader.modalPresentationStyle = .overFullScreen`
`32`	`32`	`self?.present(qrReader, animated: true, completion: nil)`
`33`	`33`	`}`
`34`		`- } else {`
`35`		`- return`
`36`	`34`	`}`
`37`	`35`	`}`
`38`		`-`
`39`	`36`	`case .restricted:`
`40`	`37`	`let alert = UIAlertController(title: nil, message: String.adamantLocalized.login.cameraNotSupported, preferredStyle: .alert)`
`41`	`38`	`alert.addAction(UIAlertAction(title: String.adamantLocalized.alert.ok, style: .cancel, handler: nil))`