Skip to content

Commit

Permalink
fix(syntax): Swift 5
Browse files Browse the repository at this point in the history
  • Loading branch information
cmgustavo committed Mar 27, 2019
1 parent 7f7d39f commit 692c126
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions src/ios/QRScanner.swift
Expand Up @@ -232,8 +232,8 @@ class QRScanner : CDVPlugin, AVCaptureMetadataOutputObjectsDelegate {
}

// This method processes metadataObjects captured by iOS.
func metadataOutput(_ captureOutput: AVCaptureMetadataOutput!, didOutputMetadataObjects metadataObjects: [Any]!, from connection: AVCaptureConnection!) {
if metadataObjects == nil || metadataObjects.count == 0 || scanning == false {
func metadataOutput(_ captureOutput: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) {
if metadataObjects.count == 0 || scanning == false {
// while nothing is detected, or if scanning is false, do nothing.
return
}
Expand All @@ -247,8 +247,8 @@ class QRScanner : CDVPlugin, AVCaptureMetadataOutputObjectsDelegate {
}

@objc func pageDidLoad() {
self.webView?.isOpaque = false
self.webView?.backgroundColor = UIColor.clear
self.webView?.isOpaque = false
self.webView?.backgroundColor = UIColor.clear
}

// ---- BEGIN EXTERNAL API ----
Expand Down Expand Up @@ -376,15 +376,15 @@ class QRScanner : CDVPlugin, AVCaptureMetadataOutputObjectsDelegate {
@objc func destroy(_ command: CDVInvokedUrlCommand) {
self.makeOpaque()
if(self.captureSession != nil){
backgroundThread(delay: 0, background: {
self.captureSession!.stopRunning()
self.cameraView.removePreviewLayer()
self.captureVideoPreviewLayer = nil
self.metaOutput = nil
self.captureSession = nil
self.currentCamera = 0
self.frontCamera = nil
self.backCamera = nil
backgroundThread(delay: 0, background: {
self.captureSession!.stopRunning()
self.cameraView.removePreviewLayer()
self.captureVideoPreviewLayer = nil
self.metaOutput = nil
self.captureSession = nil
self.currentCamera = 0
self.frontCamera = nil
self.backCamera = nil
}, completion: {
self.getStatus(command)
})
Expand Down Expand Up @@ -479,7 +479,7 @@ class QRScanner : CDVPlugin, AVCaptureMetadataOutputObjectsDelegate {
self.sendErrorCode(command: command, error: QRScannerError.open_settings_unavailable)
}
} else {
// pre iOS 10.0
// pre iOS 10.0
if #available(iOS 8.0, *) {
UIApplication.shared.openURL(NSURL(string: UIApplication.openSettingsURLString)! as URL)
self.getStatus(command)
Expand Down

0 comments on commit 692c126

Please sign in to comment.