fix

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] != nil) return NO;
+    if ([[CCUtility getBlockCode] length] == 0) return NO;
     
     // se non c'è attivo un account esci con NON attivare la richiesta password
     if ([self.activeAccount length] == 0) return NO;

iOSClient/Create/CCCreateCloud.swift

@@ -566,18 +566,20 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
     
 }
 
+@objc protocol createFormUploadFileDelegate {
+    
+    func dismissFormUploadAssets()
+}
+
 class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
     
     var serverUrl : String = ""
     var titleServerUrl : String?
-    var assets: NSMutableArray = []
-    var cryptated : Bool = false
-    var session : String = ""
-    weak var delegate: createFormUploadAssetsDelegate?
+    weak var delegate: createFormUploadFileDelegate?
     
     let appDelegate = UIApplication.shared.delegate as! AppDelegate
     
-    convenience init(_ titleServerUrl : String?, serverUrl : String, assets : NSMutableArray, cryptated : Bool, session : String, delegate: createFormUploadAssetsDelegate) {
+    convenience init(_ titleServerUrl : String?, serverUrl : String, assets : NSMutableArray, cryptated : Bool, session : String, delegate: createFormUploadFileDelegate) {
         
         self.init()
         
@@ -588,7 +590,6 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
         }
         
         self.serverUrl = serverUrl
-        self.session = session
         self.delegate = delegate
         
         self.initializeForm()
@@ -628,16 +629,6 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
         }
         section.addFormRow(row)
         
-        // Section: Preview File Name
-        
-        row = XLFormRowDescriptor(tag: "previewFileName", rowType: XLFormRowDescriptorTypeTextView, title: "")
-        row.height = 180
-        row.cellConfig.setObject(NCBrandColor.sharedInstance.tableBackground, forKey: "backgroundColor" as NSCopying)
-        row.cellConfig.setObject(NCBrandColor.sharedInstance.tableBackground, forKey: "textView.backgroundColor" as NSCopying)
-        
-        row.disabled = true
-        section.addFormRow(row)
-        
         self.form = form
     }
     
@@ -656,10 +647,7 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
             }
             
             self.form.delegate = self
-            
-            let previewFileName : XLFormRowDescriptor  = self.form.formRow(withTag: "previewFileName")!
-            previewFileName.value = self.previewFileName(valueRename: formRow.value as? String)
-            
+                        
             // reload cell
             if fileName != nil {
                 
@@ -671,7 +659,6 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
                 }
             }
             
-            self.reloadFormRow(previewFileName)
         }
     }
     
@@ -713,10 +700,6 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
         let buttonDestinationFolder : XLFormRowDescriptor  = self.form.formRow(withTag: "ButtonDestinationFolder")!
         buttonDestinationFolder.title = self.titleServerUrl
         
-        let maskFileName : XLFormRowDescriptor = self.form.formRow(withTag: "maskFileName")!
-        let previewFileName : XLFormRowDescriptor  = self.form.formRow(withTag: "previewFileName")!
-        previewFileName.value = self.previewFileName(valueRename: maskFileName.value as? String)
-        
         self.tableView.reloadData()
         self.form.delegate = self
     }
@@ -796,7 +779,7 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
                 useSubFolder = (useSubFolderRow.value! as AnyObject).boolValue
             }
             
-            self.appDelegate.activeMain.uploadFileAsset(self.assets, serverUrl: self.serverUrl, cryptated: self.cryptated, useSubFolder: useSubFolder, session: self.session)
+            //self.appDelegate.activeMain.uploadFileAsset(self.assets, serverUrl: self.serverUrl, cryptated: self.cryptated, useSubFolder: useSubFolder, session: self.session)
         })
     }
     
@@ -805,39 +788,6 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
         self.dismiss(animated: true, completion: nil)
     }
     
-    // MARK: - Utility
-    
-    func previewFileName(valueRename : String?) -> String {
-        
-        var returnString : String = ""
-        let asset = assets[0] as! PHAsset
-        
-        if let valueRename = valueRename {
-            
-            let valueRenameTrimming = valueRename.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
-            
-            if valueRenameTrimming.characters.count > 0 {
-                
-                self.form.delegate = nil
-                CCUtility.setFileNameMask(valueRenameTrimming, key: k_keyFileNameMask)
-                self.form.delegate = self
-                
-                returnString = CCUtility.createFileName(asset.value(forKey: "filename"), fileDate: asset.creationDate, fileType: asset.mediaType, keyFileName: k_keyFileNameMask, keyFileNameType: k_keyFileNameType)
-            } else {
-                
-                CCUtility.setFileNameMask("", key: k_keyFileNameMask)
-                returnString = CCUtility.createFileName(asset.value(forKey: "filename"), fileDate: asset.creationDate, fileType: asset.mediaType, keyFileName: nil, keyFileNameType: k_keyFileNameType)
-            }
-            
-        } else {
-            
-            CCUtility.setFileNameMask("", key: k_keyFileNameMask)
-            returnString = CCUtility.createFileName(asset.value(forKey: "filename"), fileDate: asset.creationDate, fileType: asset.mediaType, keyFileName: nil, keyFileNameType: k_keyFileNameType)
-        }
-        
-        return NSLocalizedString("_preview_filename_", comment: "") + ":" + "\n\n" + returnString
-    }
-    
     func changeDestinationFolder(_ sender: XLFormRowDescriptor) {
         
         self.deselectFormRow(sender)

iOSClient/Main/CCMain.m

@@ -5745,77 +5745,83 @@
 // can i go to next viewcontroller
 - (void)performSegueDirectoryWithControlPasscode:(BOOL)controlPasscode
 {
-    @synchronized (self) {
-        
-        NSString *nomeDir;
+    NSString *nomeDir;
 
-        if(self.tableView.editing == NO && _metadata.errorPasscode == NO){
+    if(self.tableView.editing == NO && _metadata.errorPasscode == NO){
         
-            NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID];
-            if (!serverUrl) return;
+        NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID];
+        if (!serverUrl) return;
         
-            NSString *lockServerUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:_metadata.fileNameData];
+        NSString *lockServerUrl = [CCUtility stringAppendServerUrl:serverUrl addFileName:_metadata.fileNameData];
         
-            tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", app.activeAccount, lockServerUrl]];
+        tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", app.activeAccount, lockServerUrl]];
         
-            // SE siamo in presenza di una directory bloccata E è attivo il block E la sessione password Lock è senza data ALLORA chiediamo la password per procedere
-            if (directory.lock && [[CCUtility getBlockCode] length] && app.sessionePasscodeLock == nil && controlPasscode) {
+        // SE siamo in presenza di una directory bloccata E è attivo il block E la sessione password Lock è senza data ALLORA chiediamo la password per procedere
+        if (directory.lock && [[CCUtility getBlockCode] length] && app.sessionePasscodeLock == nil && controlPasscode) {
             
-                CCBKPasscode *viewController = [[CCBKPasscode alloc] initWithNibName:nil bundle:nil];
-                viewController.delegate = self;
-                viewController.fromType = CCBKPasscodeFromLockDirectory;
-                viewController.type = BKPasscodeViewControllerCheckPasscodeType;
-                viewController.inputViewTitlePassword = YES;
+            CCBKPasscode *viewController = [[CCBKPasscode alloc] initWithNibName:nil bundle:nil];
+            viewController.delegate = self;
+            viewController.fromType = CCBKPasscodeFromLockDirectory;
+            viewController.type = BKPasscodeViewControllerCheckPasscodeType;
+            viewController.inputViewTitlePassword = YES;
             
-                if ([CCUtility getSimplyBlockCode]) {
+            if ([CCUtility getSimplyBlockCode]) {
                 
-                    viewController.passcodeStyle = BKPasscodeInputViewNumericPasscodeStyle;
-                    viewController.passcodeInputView.maximumLength = 6;
+                viewController.passcodeStyle = BKPasscodeInputViewNumericPasscodeStyle;
+                viewController.passcodeInputView.maximumLength = 6;
                 
-                } else {
+            } else {
                 
-                    viewController.passcodeStyle = BKPasscodeInputViewNormalPasscodeStyle;
-                    viewController.passcodeInputView.maximumLength = 64;
-                }
+                viewController.passcodeStyle = BKPasscodeInputViewNormalPasscodeStyle;
+                viewController.passcodeInputView.maximumLength = 64;
+            }
 
-                BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
-                touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
-                viewController.touchIDManager = touchIDManager;
+            BKTouchIDManager *touchIDManager = [[BKTouchIDManager alloc] initWithKeychainServiceName:k_serviceShareKeyChain];
+            touchIDManager.promptText = NSLocalizedString(@"_scan_fingerprint_", nil);
+            viewController.touchIDManager = touchIDManager;
             
-                viewController.title = NSLocalizedString(@"_folder_blocked_", nil);
-                viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
-                viewController.navigationItem.leftBarButtonItem.tintColor = [NCBrandColor sharedInstance].cryptocloud;
+            viewController.title = NSLocalizedString(@"_folder_blocked_", nil);
+            viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(passcodeViewCloseButtonPressed:)];
+            viewController.navigationItem.leftBarButtonItem.tintColor = [NCBrandColor sharedInstance].cryptocloud;
             
-                UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
-                [self presentViewController:navController animated:YES completion:nil];
+            UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
+            [self presentViewController:navController animated:YES completion:nil];
             
-                return;
-            }
-        
-            if (_metadata.cryptated) nomeDir = [_metadata.fileName substringToIndex:[_metadata.fileName length]-6];
-            else nomeDir = _metadata.fileName;
+            return;
+        }
         
-            NSString *serverUrlPush = [CCUtility stringAppendServerUrl:serverUrl addFileName:nomeDir];
+        if (_metadata.cryptated) nomeDir = [_metadata.fileName substringToIndex:[_metadata.fileName length]-6];
+        else nomeDir = _metadata.fileName;
         
-            CCMain *viewController = [app.listMainVC objectForKey:serverUrlPush];
+        NSString *serverUrlPush = [CCUtility stringAppendServerUrl:serverUrl addFileName:nomeDir];
+    
+        CCMain *viewController = [app.listMainVC objectForKey:serverUrlPush];
         
-            if (viewController.isViewLoaded == false || viewController == nil) {
+        if (viewController.isViewLoaded == false || viewController == nil) {
             
-                viewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"CCMainVC"];
+            viewController = [[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"CCMainVC"];
             
-                viewController.isFolderEncrypted = _metadata.cryptated;
-                viewController.serverUrl = serverUrlPush;
-                viewController.titleMain = _metadata.fileNamePrint;
-                viewController.textBackButton = _titleMain;
+            viewController.isFolderEncrypted = _metadata.cryptated;
+            viewController.serverUrl = serverUrlPush;
+            viewController.titleMain = _metadata.fileNamePrint;
+            viewController.textBackButton = _titleMain;
             
-                // save self
-                [app.listMainVC setObject:viewController forKey:serverUrlPush];
-            }
+            // save self
+            [app.listMainVC setObject:viewController forKey:serverUrlPush];
+        }
         
+        if (viewController) {
+                
             // OFF SearchBar
             [viewController cancelSearchBar];
         
-            [self.navigationController pushViewController:viewController animated:YES];
+            @try {
+                [self.navigationController pushViewController:viewController animated:YES];
+            } @catch (NSException *e) {
+                NSLog(@"Exception: %@", e);
+            } @finally {
+                NSLog(@"Push View Controller %@", nomeDir);
+            }
         }
     }
 }