clear code

iOSClient/AppDelegate.m

@@ -94,8 +94,8 @@
     if (![[NSFileManager defaultManager] fileExistsAtPath: path])
         [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil];
     
-    // create Directory PDFGenerator
-    path = [[dirGroup URLByAppendingPathComponent:k_appPDFGenerator] path];
+    // create Directory Scan
+    path = [[dirGroup URLByAppendingPathComponent:k_appScan] path];
     if (![[NSFileManager defaultManager] fileExistsAtPath:path])
         [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil];
     

iOSClient/CCGlobal.h

@@ -44,7 +44,7 @@
 #define k_appDatabaseNextcloud                          @"Library/Application Support/Nextcloud"
 #define k_appUserData                                   @"Library/Application Support/UserData"
 #define k_appCertificates                               @"Library/Application Support/Certificates"
-#define k_appPDFGenerator                               @"Library/Application Support/PDFGenerator"
+#define k_appScan                                       @"Library/Application Support/Scan"
 #define k_DirectoryProviderStorage                      @"File Provider Storage"
 
 // Server Status

iOSClient/Create/CCCreateCloud.swift

@@ -700,15 +700,15 @@ class NCCreateScanDocument : NSObject, ImageScannerControllerDelegate {
         
         scanner.dismiss(animated: true, completion: nil)
         
-        guard let image = getScannedImage(inputImage: results.scannedImage) else {
-            return
-        }
+        //guard let image = getScannedImage(inputImage: results.scannedImage) else {
+        //    return
+        //}
         
         let fileName = CCUtility.createFileName("scan.png", fileDate: Date(), fileType: PHAssetMediaType.image, keyFileName: k_keyFileNameMask, keyFileNameType: k_keyFileNameType, keyFileNameOriginal: k_keyFileNameOriginal)!
-        let fileNamePath = CCUtility.getDirectoryPDFGenerator() + "/" + fileName
+        let fileNamePath = CCUtility.getDirectoryScan() + "/" + fileName
         
         do {
-            try UIImagePNGRepresentation(image)?.write(to: NSURL.fileURL(withPath: fileNamePath), options: .atomic)
+            try UIImagePNGRepresentation(results.scannedImage)?.write(to: NSURL.fileURL(withPath: fileNamePath), options: .atomic)
         } catch { }
         
         let storyboard = UIStoryboard(name: "Scan", bundle: nil)
@@ -746,27 +746,6 @@ class NCCreateScanDocument : NSObject, ImageScannerControllerDelegate {
         appDelegate.messageNotification("_error_", description: error.localizedDescription, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: Int(k_CCErrorInternalError))
         print(error)
     }
-    
-    func getScannedImage(inputImage: UIImage) -> UIImage? {
-        
-        let openGLContext = EAGLContext(api: .openGLES2)
-        let context = CIContext(eaglContext: openGLContext!)
-        
-        let filter = CIFilter(name: "CIColorControls")
-        let coreImage = CIImage(image: inputImage)
-        
-        filter?.setValue(coreImage, forKey: kCIInputImageKey)
-        //Key value are changable according to your need.
-        filter?.setValue(7, forKey: kCIInputContrastKey)
-        filter?.setValue(1, forKey: kCIInputSaturationKey)
-        filter?.setValue(1.2, forKey: kCIInputBrightnessKey)
-        
-        if let outputImage = filter?.value(forKey: kCIOutputImageKey) as? CIImage {
-            let output = context.createCGImage(outputImage, from: outputImage.extent)
-            return UIImage(cgImage: output!)
-        }
-        return nil
-    }
 }
 
 

iOSClient/Scan/ScanCollectionView.swift

@@ -38,7 +38,7 @@ class DragDropViewController: UIViewController
     
     private func loadImage() {
         do {
-            let directoryContents = try FileManager.default.contentsOfDirectory(atPath: CCUtility.getDirectoryPDFGenerator()!)
+            let directoryContents = try FileManager.default.contentsOfDirectory(atPath: CCUtility.getDirectoryScan()!)
             for fileName in directoryContents {
                 items1.append(fileName)
             }
@@ -129,7 +129,7 @@ extension DragDropViewController : UICollectionViewDataSource
         {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell1", for: indexPath) as! ScanCell
             
-            let fileNamePath = CCUtility.getDirectoryPDFGenerator() + "/" + self.items1[indexPath.row]
+            let fileNamePath = CCUtility.getDirectoryScan() + "/" + self.items1[indexPath.row]
             let data = try? Data(contentsOf: fileNamePath.url)
             cell.customImageView?.image = UIImage(data: data!)
             cell.customLabel.text = self.items1[indexPath.row].capitalized
@@ -139,7 +139,7 @@ extension DragDropViewController : UICollectionViewDataSource
         {
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "cell2", for: indexPath) as! ScanCell
             
-            let fileNamePath = CCUtility.getDirectoryPDFGenerator() + "/" + self.items2[indexPath.row]
+            let fileNamePath = CCUtility.getDirectoryScan() + "/" + self.items2[indexPath.row]
             let data = try? Data(contentsOf: fileNamePath.url)
             cell.customImageView?.image = UIImage(data: data!)
             cell.customLabel.text = self.items2[indexPath.row].capitalized

iOSClient/Settings/CCAdvanced.m

@@ -348,6 +348,7 @@
         
         [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryProviderStorage] error:nil];
         [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryUserData] error:nil];
+        [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryScan] error:nil];
         
         [self emptyDocumentsDirectory];
         NSArray* tmpDirectory = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:NSTemporaryDirectory() error:NULL];
@@ -466,7 +467,7 @@
             [CCUtility deleteAllChainStore];
             
             [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryProviderStorage] error:nil];
-
+            
             [self emptyDocumentsDirectory];
             
             [self emptyLibraryDirectory];

iOSClient/Utility/CCUtility.h

@@ -199,7 +199,7 @@
 
 + (BOOL)isDocumentModifiableExtension:(NSString *)fileExtension;
 
-+ (NSString *)getDirectoryPDFGenerator;
++ (NSString *)getDirectoryScan;
 
 // ===== E2E Encrypted =====
 

iOSClient/Utility/CCUtility.m

@@ -1042,9 +1042,9 @@
     return [@[@"TXT", @"MD", @"MARKDOWN", @"ORG"] containsObject:fileExtension];
 }
 
-+ (NSString *)getDirectoryPDFGenerator
++ (NSString *)getDirectoryScan
 {
-    NSString *path = [[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:k_appPDFGenerator] path];
+    NSString *path = [[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:k_appScan] path];
     
     if (![[NSFileManager defaultManager] fileExistsAtPath:path])
         [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil];