improvements

Picker/DocumentPickerViewController.swift

@@ -95,15 +95,12 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             activeUser = record.user
             directoryUser = CCUtility.getDirectoryActiveUser(activeUser, activeUrl: activeUrl)
             
-            if (self.serverUrl == nil) {
-            
-                self.serverUrl = CCUtility.getHomeServerUrlActiveUrl(activeUrl)
-                                
+            if serverUrl == nil {
+                serverUrl = CCUtility.getHomeServerUrlActiveUrl(activeUrl)
             } else {
-                
                 self.navigationItem.title = titleFolder
             }
-            
+        
         } else {
             
             // Close error no account return nil
@@ -146,26 +143,22 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         let password = CCUtility.getKeyChainPasscode(forUUID: CCUtility.getUUID())
         
         if password?.characters.count == 0 {
-            
             isCryptoCloudMode = false
-            
         } else {
-            
             isCryptoCloudMode = true
         }
         
         // Managed Crypto Cloud Mode
-        if isCryptoCloudMode == true {
+        if isCryptoCloudMode {
             
             // Encrypted mode
             encryptedButton.image = UIImage(named:"shareExtEncrypt")?.withRenderingMode(.automatic)
             
             // Color Button
-            if parameterEncrypted == true {
+            if parameterEncrypted {
                 encryptedButton.tintColor = NCBrandColor.sharedInstance.cryptocloud
             } else {
                 encryptedButton.tintColor = self.view.tintColor
-                
             }
             
             saveButton.tintColor = encryptedButton.tintColor
@@ -293,13 +286,11 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             
             // do not insert crypto file
             if CCUtility.isCryptoString(metadata.fileName) {
-                
                 continue
             }
             
             // Only Directory ?
             if (parameterMode == .moveToService || parameterMode == .exportToService) && metadata.directory == false {
-                
                 continue
             }
             
@@ -311,13 +302,11 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
                 for completeMetadata in metadatas as! [tableMetadata] {
                     
                     if completeMetadata.fileName == CCUtility.trasformedFileNamePlist(inCrypto: metadata.fileName) {
-                        
                         isCryptoComplete = true
                     }
                 }
 
                 if isCryptoComplete == false {
-                    
                     continue
                 }
             }
@@ -357,7 +346,6 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     //  MARK: - Download Thumbnail
     
     func downloadThumbnailFailure(_ metadataNet: CCMetadataNet!, message: String!, errorCode: Int) {
-        
         NSLog("[LOG] Thumbnail Error \(metadataNet.fileName) \(message) (error \(errorCode))");
     }
     
@@ -370,7 +358,6 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             if FileManager.default.fileExists(atPath: path) {
                 
                 if let cell = tableView.cellForRow(at: indexPath) as? recordMetadataCell {
-                    
                     cell.fileImageView.image = UIImage(contentsOfFile: path)
                 }
             }
@@ -432,6 +419,9 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         recordMetadata = metadata
         
+        // Save fileID for PickerFileProvide
+        CCUtility.setFileIDPicker(metadata.fileID)
+        
         switch selector {
             
         case selectorLoadFileView :
@@ -730,7 +720,6 @@ extension DocumentPickerViewController: UITableViewDelegate {
 extension DocumentPickerViewController: UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        
        return recordsTableMetadata?.count ?? 0
     }
         
@@ -772,15 +761,10 @@ extension DocumentPickerViewController: UITableViewDataSource {
         
         // Status Image View
         let lockServerUrl = CCUtility.stringAppendServerUrl(self.serverUrl!, addFileName: metadata!.fileNameData)
-        
-        var passcode: String? = CCUtility.getBlockCode()
-        if passcode == nil {
-            passcode = ""
-        }
-        
+                
         let tableDirectory = NCManageDatabase.sharedInstance.getTableDirectory(predicate:NSPredicate(format: "account = %@ AND serverUrl = %@", activeAccount, lockServerUrl!))
         if tableDirectory != nil {
-            if metadata!.directory &&  (tableDirectory?.lock)! && (passcode?.characters.count)! > 0 {
+            if metadata!.directory &&  (tableDirectory?.lock)! && (CCUtility.getBlockCode() != nil) {
                 cell.StatusImageView.image = UIImage(named: "passcode")
             } else {
                 cell.StatusImageView.image = nil
@@ -836,7 +820,6 @@ extension DocumentPickerViewController: UITableViewDataSource {
             var dir = recordMetadata.fileName
             
             if recordMetadata.cryptated {
-                
                 dir = CCUtility.trasformedFileNamePlist(inCrypto: recordMetadata.fileName)
             }
             
@@ -857,12 +840,10 @@ extension DocumentPickerViewController: UITableViewDataSource {
                     openBKPasscode(recordMetadata.fileNamePrint)
                     
                 } else {
-                    
                     performSegue()
                 }
                 
             } else {
-                
                 performSegue()
             }
         }

iOSClient/AppDelegate.m

@@ -1123,7 +1123,7 @@
     self.sessionePasscodeLock = nil;
     
     // se il block code è a zero esci con NON attivare la richiesta password
-    if ([[CCUtility getBlockCode] length] == 0) return NO;
+    if ([CCUtility getBlockCode] != nil) return NO;
     
     // se non c'è attivo un account esci con NON attivare la richiesta password
     if ([self.activeAccount length] == 0) return NO;

iOSClient/Utility/CCUtility.h

@@ -75,6 +75,8 @@
 + (void)setServerUrlShareExt:(NSString *)serverUrl;
 + (void)setTitleServerUrlShareExt:(NSString *)titleServerUrl;
 
++ (void)setFileIDPicker:(NSString *)fileID;
+
 + (void)setEmail:(NSString *)email;
 
 + (void)setHint:(NSString *)hint;
@@ -118,6 +120,8 @@
 + (NSString *)getServerUrlShareExt;
 + (NSString *)getTitleServerUrlShareExt;
 
++ (NSString *)getFileIDPicker;
+
 + (NSString *)getEmail;
 
 + (NSString *)getHint;

iOSClient/Utility/CCUtility.m

@@ -171,6 +171,11 @@
     [UICKeyChainStore setString:titleServerUrl forKey:@"titleServerUrlShareExt" service:k_serviceShareKeyChain];
 }
 
++ (void)setFileIDPicker:(NSString *)fileID
+{
+    [UICKeyChainStore setString:fileID forKey:@"fileIDPicker" service:k_serviceShareKeyChain];
+}
+
 + (void)setEmail:(NSString *)email
 {
     [UICKeyChainStore setString:email forKey:@"email" service:k_serviceShareKeyChain];
@@ -365,6 +370,11 @@
     return [UICKeyChainStore stringForKey:@"titleServerUrlShareExt" service:k_serviceShareKeyChain];
 }
 
++ (NSString *)getFileIDPicker
+{
+    return [UICKeyChainStore stringForKey:@"fileIDPicker" service:k_serviceShareKeyChain];
+}
+
 + (NSString *)getEmail
 {
     return [UICKeyChainStore stringForKey:@"email" service:k_serviceShareKeyChain];