dev

iOSClient/AppDelegate.m

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

iOSClient/CCGlobal.h

@@ -45,6 +45,8 @@
 #define k_appUserData                                   @"Library/Application Support/UserData"
 #define k_appCertificates                               @"Library/Application Support/Certificates"
 #define k_appScan                                       @"Library/Application Support/Scan"
+#define k_appScanSelect                                 @"Library/Application Support/Scan/Select"
+
 #define k_DirectoryProviderStorage                      @"File Provider Storage"
 
 // Server Status

iOSClient/Scan/ScanCollectionView.swift

@@ -49,7 +49,7 @@ class DragDropViewController: UIViewController
         appDelegate.aspectNavigationControllerBar(self.navigationController?.navigationBar, online: appDelegate.reachability.isReachable(), hidden: false)
         appDelegate.aspectTabBar(self.tabBarController?.tabBar, hidden: false)
         
-        loadImage()
+        loadImage(atPath: CCUtility.getDirectoryScan(), items: &items1)
     }
     
     @IBAction func cancelAction(sender: UIBarButtonItem) {
@@ -60,11 +60,15 @@ class DragDropViewController: UIViewController
         
     }
     
-    private func loadImage() {
+    //MARK: Private Methods
+    
+    private func loadImage(atPath: String, items: inout [String]) {
         do {
-            let directoryContents = try FileManager.default.contentsOfDirectory(atPath: CCUtility.getDirectoryScan()!)
+            let directoryContents = try FileManager.default.contentsOfDirectory(atPath: atPath)
             for fileName in directoryContents {
-                items1.append(fileName)
+                if fileName != "Select" && fileName.first != "." {
+                    items.append(fileName)
+                }
             }
         }
         catch {
@@ -72,8 +76,6 @@ class DragDropViewController: UIViewController
         }
     }
     
-    //MARK: Private Methods
-    
     /// This method moves a cell from source indexPath to destination indexPath within the same collection view. It works for only 1 item. If multiple items selected, no reordering happens.
     ///
     /// - Parameters:

iOSClient/Utility/CCUtility.h

@@ -200,6 +200,7 @@
 + (BOOL)isDocumentModifiableExtension:(NSString *)fileExtension;
 
 + (NSString *)getDirectoryScan;
++ (NSString *)getDirectoryScanSelect;
 
 // ===== E2E Encrypted =====
 

iOSClient/Utility/CCUtility.m

@@ -1052,6 +1052,16 @@
     return path;
 }
 
++ (NSString *)getDirectoryScanSelect
+{
+    NSString *path = [[[CCUtility getDirectoryGroup] URLByAppendingPathComponent:k_appScanSelect] path];
+    
+    if (![[NSFileManager defaultManager] fileExistsAtPath:path])
+        [[NSFileManager defaultManager] createDirectoryAtPath:path withIntermediateDirectories:YES attributes:nil error:nil];
+    
+    return path;
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== E2E Encrypted =====
 #pragma --------------------------------------------------------------------------------------------