fix ScanDocument SDK 13

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -645,6 +645,8 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate {
     }
 }
 
+@available(iOS 11, *)
+
 class NCCreateScanDocument : NSObject, ImageScannerControllerDelegate {
     
     @objc static let sharedInstance: NCCreateScanDocument = {
@@ -654,12 +656,10 @@ class NCCreateScanDocument : NSObject, ImageScannerControllerDelegate {
     
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     var viewController: UIViewController?
-    var openScan: Bool = false
     
-    func openScannerDocument(viewController: UIViewController, openScan: Bool) {
+    func openScannerDocument(viewController: UIViewController) {
         
         self.viewController = viewController
-        self.openScan = openScan
         
         let scannerVC = ImageScannerController()
         scannerVC.imageScannerDelegate = self
@@ -690,7 +690,9 @@ class NCCreateScanDocument : NSObject, ImageScannerControllerDelegate {
         }
 
         scanner.dismiss(animated: true, completion: {
-            if (self.openScan) {
+            if self.viewController is DragDropViewController {
+                (self.viewController as! DragDropViewController).loadImage()
+            } else {
                 let storyboard = UIStoryboard(name: "Scan", bundle: nil)
                 let controller = storyboard.instantiateInitialViewController()!
                 

iOSClient/Main/Create cloud/NCCreateMenuAdd.swift

@@ -83,7 +83,7 @@ class NCCreateMenuAdd: NSObject {
             }
             if item.value as? Int == 40 {
                 if #available(iOS 11.0, *) {
-                    NCCreateScanDocument.sharedInstance.openScannerDocument(viewController: self.appDelegate.activeMain, openScan: true)
+                    NCCreateScanDocument.sharedInstance.openScannerDocument(viewController: self.appDelegate.activeMain)
                 }
             }
             

iOSClient/ScanDocument/ScanCollectionView.swift

@@ -89,24 +89,12 @@ class DragDropViewController: UIViewController {
         // changeTheming
         NotificationCenter.default.addObserver(self, selector: #selector(self.changeTheming), name: NSNotification.Name(rawValue: "changeTheming"), object: nil)
         changeTheming()
-    }
-    
-    override func viewWillAppear(_ animated: Bool) {
-        super.viewWillAppear(animated)
-                
+        
         labelTitlePDFzone.textColor = NCBrandColor.sharedInstance.brandText
         labelTitlePDFzone.backgroundColor = NCBrandColor.sharedInstance.brand
-        
         segmentControlFilter.tintColor = NCBrandColor.sharedInstance.brand
         
-        // Save button
-        if imagesDestination.count == 0 {
-            save.isEnabled = false
-        } else {
-            save.isEnabled = true
-        }
-        
-        loadImage(atPath: CCUtility.getDirectoryScan(), items: &itemsSource)
+        loadImage()
     }
     
     @objc func changeTheming() {
@@ -139,7 +127,7 @@ class DragDropViewController: UIViewController {
     
     @IBAction func add(sender: UIButton) {
         
-        NCCreateScanDocument.sharedInstance.openScannerDocument(viewController: self, openScan: false)
+        NCCreateScanDocument.sharedInstance.openScannerDocument(viewController: self)
     }
     
     @IBAction func transferDown(sender: UIButton) {
@@ -185,28 +173,36 @@ class DragDropViewController: UIViewController {
         collectionViewDestination.reloadData()
     }
     
-    //MARK: Private Methods
-    
-    private func loadImage(atPath: String, items: inout [String]) {
+    func loadImage() {
         
-        items.removeAll()
+        itemsSource.removeAll()
 
         do {
+            let atPath = CCUtility.getDirectoryScan()!
             let directoryContents = try FileManager.default.contentsOfDirectory(atPath: atPath)
             for fileName in directoryContents {
                 if fileName.first != "." {
-                    items.append(fileName)
+                    itemsSource.append(fileName)
                 }
             }
         } catch {
             print(error.localizedDescription)
         }
         
-        items = items.sorted()
+        itemsSource = itemsSource.sorted()
         
         collectionViewSource.reloadData()
+        
+        // Save button
+        if imagesDestination.count == 0 {
+            save.isEnabled = false
+        } else {
+            save.isEnabled = true
+        }
     }
     
+    //MARK: Private Methods
+    
     func filter(image: UIImage) -> UIImage? {
         
         var inputContrast: Double = 0
@@ -365,8 +361,8 @@ class DragDropViewController: UIViewController {
             } catch {
                 return
             }
-            
-            loadImage(atPath: CCUtility.getDirectoryScan(), items: &itemsSource)
+
+            loadImage()
         }
     }
 }