lint

Signed-off-by: marinofaggiana <ios@nextcloud.com>

iOSClient/ScanDocument/NCScan+CollectionView.swift

@@ -39,13 +39,7 @@ extension NCScan: UICollectionViewDataSource {
 
             let fileNamePath = CCUtility.getDirectoryScan() + "/" + itemsSource[indexPath.row]
 
-            guard let data = try? Data(contentsOf: URL(fileURLWithPath: fileNamePath)) else {
-                return cell
-            }
-
-            guard var image = UIImage(data: data) else {
-                return cell
-            }
+            guard let data = try? Data(contentsOf: URL(fileURLWithPath: fileNamePath)), var image = UIImage(data: data) else { return cell }
 
             let imageWidthInPixels = image.size.width * image.scale
             let imageHeightInPixels = image.size.height * image.scale
@@ -87,7 +81,7 @@ extension NCScan: UICollectionViewDataSource {
                 image = image.resizeImage(size: CGSize(width: 595, height: 842), isAspectRation: true) ?? image
             }
 
-            cell.customImageView?.image = self.filter(image: image)
+            cell.customImageView?.image = filter(image: image)
             cell.customLabel.text = NSLocalizedString("_scan_document_pdf_page_", comment: "") + " " + "\(indexPath.row + 1)"
 
             return cell
@@ -202,7 +196,7 @@ extension NCScan: UICollectionViewDropDelegate {
 
                 destinationIndexPath = IndexPath(row: row, section: section)
             }
-            self.reorderItems(coordinator: coordinator, destinationIndexPath: destinationIndexPath, collectionView: collectionView)
+            reorderItems(coordinator: coordinator, destinationIndexPath: destinationIndexPath, collectionView: collectionView)
 
         case .copy:
 
@@ -211,7 +205,7 @@ extension NCScan: UICollectionViewDropDelegate {
             let row = collectionView.numberOfItems(inSection: section)
 
             destinationIndexPath = IndexPath(row: row, section: section)
-            self.copyItems(coordinator: coordinator, destinationIndexPath: destinationIndexPath, collectionView: collectionView)
+            copyItems(coordinator: coordinator, destinationIndexPath: destinationIndexPath, collectionView: collectionView)
 
         default:
             return

iOSClient/ScanDocument/NCScan.swift

@@ -144,8 +144,7 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
 
                 let fileNamePathAt = CCUtility.getDirectoryScan() + "/" + fileName
 
-                guard let data = try? Data(contentsOf: URL(fileURLWithPath: fileNamePathAt)) else { return }
-                guard let image = UIImage(data: data) else { return }
+                guard let data = try? Data(contentsOf: URL(fileURLWithPath: fileNamePathAt)), let image = UIImage(data: data) else { return }
 
                 imagesDestination.append(image)
                 itemsDestination.append(fileName)
@@ -280,12 +279,7 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
                     let fileName = (item.dragItem.localObject as? String)!
                     let fileNamePathAt = CCUtility.getDirectoryScan() + "/" + fileName
 
-                    guard let data = try? Data(contentsOf: URL(fileURLWithPath: fileNamePathAt)) else {
-                        return
-                    }
-                    guard let image = UIImage(data: data) else {
-                        return
-                    }
+                    guard let data = try? Data(contentsOf: URL(fileURLWithPath: fileNamePathAt)), let image = UIImage(data: data) else { return }
 
                     imagesDestination.insert(image, at: indexPath.row)
                     itemsDestination.insert(fileName, at: indexPath.row)
@@ -326,6 +320,8 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
 
         if pasteboard.hasImages {
 
+            guard let image = pasteboard.image?.fixedOrientation() else { return }
+
             let fileName = CCUtility.createFileName("scan.png", fileDate: Date(),
                                                     fileType: PHAssetMediaType.image,
                                                     keyFileName: NCGlobal.shared.keyFileNameMask,
@@ -334,10 +330,6 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
                                                     forcedNewFileName: true)!
             let fileNamePath = CCUtility.getDirectoryScan() + "/" + fileName
 
-            guard let image = pasteboard.image?.fixedOrientation() else {
-                return
-            }
-
             do {
                 try image.pngData()?.write(to: NSURL.fileURL(withPath: fileNamePath), options: .atomic)
             } catch {
@@ -366,9 +358,9 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
     func rotate(with imageIndex: Int, sender: Any) {
 
         let indexPath = IndexPath(row: imageIndex, section: 0)
-        if let cell = self.collectionViewDestination.cellForItem(at: indexPath) as? NCScanCell {
+        if let cell = collectionViewDestination.cellForItem(at: indexPath) as? NCScanCell {
 
-            var image = self.imagesDestination[imageIndex]
+            var image = imagesDestination[imageIndex]
             image = image.rotate(radians: .pi / 2)!
             imagesDestination[imageIndex] = image
             cell.customImageView.image = image