add fileNameView -> Metadata

iOSClient/Database/NCDatabase.swift

@@ -182,6 +182,7 @@ class tableMetadata: Object {
     @objc dynamic var favorite: Bool = false
     @objc dynamic var fileID = ""
     @objc dynamic var fileName = ""
+    @objc dynamic var fileNameView = ""
     @objc dynamic var iconName = ""
     @objc dynamic var permissions = ""
     @objc dynamic var session = ""

iOSClient/Database/NCManageDatabase.swift

@@ -62,6 +62,7 @@ class NCManageDatabase: NSObject {
             // 10 : Version 2.18.0
             // 11 : Add object tableE2eEncryption
             // 12 : Change primary key of tableE2eEncryption for fileNameIdentifier, remove filed metadataKey, add tokenLock on Table Directory
+            //    : add fileNameView on Metadata
             
             migrationBlock: { migration, oldSchemaVersion in
                 // We haven’t migrated anything yet, so oldSchemaVersion == 0

iOSClient/Favorites/CCFavorites.m

@@ -556,7 +556,7 @@
     cell.labelTitle.textColor = [UIColor blackColor];
     
     // filename
-    cell.labelTitle.text = metadata.fileName;
+    cell.labelTitle.text = metadata.fileNameView;
     cell.labelInfoFile.text = @"";
     
     // Shared

iOSClient/Login/CCLogin.m

@@ -253,62 +253,65 @@
 
 - (void)loginCloud
 {
-    self.login.enabled = NO;
-    self.loadingBaseUrl.hidden = NO;
-
     // remove last char if /
     if ([[self.baseUrl.text substringFromIndex:[self.baseUrl.text length] - 1] isEqualToString:@"/"])
         self.baseUrl.text = [self.baseUrl.text substringToIndex:[self.baseUrl.text length] - 1];
     
     NSError *error = [[NCNetworkingSync sharedManager] checkServer:[NSString stringWithFormat:@"%@%@", self.baseUrl.text, webDAV] user:self.user.text userID:self.user.text password:self.password.text];
 
-    if (!error) {
+    dispatch_async(dispatch_get_main_queue(), ^{
+
+        self.login.enabled = NO;
+        self.loadingBaseUrl.hidden = NO;
+        
+        if (!error) {
         
-        // account
-        NSString *account = [NSString stringWithFormat:@"%@ %@", self.user.text, self.baseUrl.text];
+            // account
+            NSString *account = [NSString stringWithFormat:@"%@ %@", self.user.text, self.baseUrl.text];
         
-        if (_loginType == loginModifyPasswordUser) {
+            if (_loginType == loginModifyPasswordUser) {
             
-            // Change Password
-            tableAccount *tbAccount = [[NCManageDatabase sharedInstance] setAccountPassword:account password:self.password.text];
+                // Change Password
+                tableAccount *tbAccount = [[NCManageDatabase sharedInstance] setAccountPassword:account password:self.password.text];
             
-            // Setting App active account
-            [app settingActiveAccount:tbAccount.account activeUrl:tbAccount.url activeUser:tbAccount.user activeUserID:tbAccount.userID activePassword:tbAccount.password];
+                // Setting App active account
+                [app settingActiveAccount:tbAccount.account activeUrl:tbAccount.url activeUser:tbAccount.user activeUserID:tbAccount.userID activePassword:tbAccount.password];
 
-            // Dismiss
-            if ([self.delegate respondsToSelector:@selector(loginSuccess:)])
-                [self.delegate loginSuccess:_loginType];
+                // Dismiss
+                if ([self.delegate respondsToSelector:@selector(loginSuccess:)])
+                    [self.delegate loginSuccess:_loginType];
             
-            [self dismissViewControllerAnimated:YES completion:nil];
+                [self dismissViewControllerAnimated:YES completion:nil];
             
-        } else {
+            } else {
 
-            [[NCManageDatabase sharedInstance] deleteAccount:account];
-            [[NCManageDatabase sharedInstance] addAccount:account url:self.baseUrl.text user:self.user.text password:self.password.text];
+                [[NCManageDatabase sharedInstance] deleteAccount:account];
+                [[NCManageDatabase sharedInstance] addAccount:account url:self.baseUrl.text user:self.user.text password:self.password.text];
             
-            // Read User Profile
-            CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:account];
-            metadataNet.action = actionGetUserProfile;
-            [app.netQueue addOperation:[[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:self.user.text withUserID:self.user.text withPassword:self.password.text withUrl:self.baseUrl.text]];
-        }
+                // Read User Profile
+                CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:account];
+                metadataNet.action = actionGetUserProfile;
+                [app.netQueue addOperation:[[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:self.user.text withUserID:self.user.text withPassword:self.password.text withUrl:self.baseUrl.text]];
+            }
         
-    } else {
+        } else {
         
-        if ([error code] != NSURLErrorServerCertificateUntrusted) {
+            if ([error code] != NSURLErrorServerCertificateUntrusted) {
             
-            NSString *description = [error.userInfo objectForKey:@"NSLocalizedDescription"];
-            NSString *message = [NSString stringWithFormat:@"%@.\n%@", NSLocalizedStringFromTable(@"_not_possible_connect_to_server_", @"Error", nil), description];
+                NSString *description = [error.userInfo objectForKey:@"NSLocalizedDescription"];
+                NSString *message = [NSString stringWithFormat:@"%@.\n%@", NSLocalizedStringFromTable(@"_not_possible_connect_to_server_", @"Error", nil), description];
             
-            UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_error_", nil) message:message preferredStyle:UIAlertControllerStyleAlert];
-            UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"_ok_", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {}];
+                UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"_error_", nil) message:message preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"_ok_", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {}];
             
-            [alertController addAction:okAction];
-            [self presentViewController:alertController animated:YES completion:nil];
+                [alertController addAction:okAction];
+                [self presentViewController:alertController animated:YES completion:nil];
+            }
         }
-    }
         
-    self.login.enabled = YES;
-    self.loadingBaseUrl.hidden = YES;
+        self.login.enabled = YES;
+        self.loadingBaseUrl.hidden = YES;
+    });
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -410,8 +413,12 @@
 
 - (IBAction)handleButtonLogin:(id)sender
 {
-    if ([self.baseUrl.text length] > 0 && [self.user.text length] && [self.password.text length])
-        [self performSelector:@selector(loginCloud) withObject:nil];
+    if ([self.baseUrl.text length] > 0 && [self.user.text length] && [self.password.text length]) {
+        
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+            [self performSelector:@selector(loginCloud) withObject:nil];
+        });
+    }
 }
 
 - (IBAction)handleAnnulla:(id)sender

iOSClient/Main/CCMain.m

@@ -4640,7 +4640,7 @@
     // ----------------------------------------------------------------------------------------------------------
     
     // nome del file
-    cell.labelTitle.text = metadata.fileName;
+    cell.labelTitle.text = metadata.fileNameView;
     
     // è una directory
     if (metadata.directory) {

iOSClient/Main/CCSection.m

@@ -77,8 +77,8 @@
         for (tableE2eEncryption *e2eEncryption in e2eEncryptions) {
             if ([metadata.fileName isEqualToString:e2eEncryption.fileNameIdentifier]) {
                 metadata.encrypted = true;
-                metadata.fileName = e2eEncryption.fileName;
-                [CCUtility insertTypeFileIconName:metadata.fileName metadata:metadata];
+                metadata.fileNameView = e2eEncryption.fileName;
+                [CCUtility insertTypeFileIconName:metadata.fileNameView metadata:metadata];
                 break;
             }
         }

iOSClient/Transfers/CCTransfers.m

@@ -566,7 +566,7 @@
     // ----------------------------------------------------------------------------------------------------------
     
     // nome del file
-    cell.labelTitle.text = metadata.fileName;
+    cell.labelTitle.text = metadata.fileNameView;
     
     // è una directory
     if (metadata.directory) {

iOSClient/Utility/CCUtility.h

@@ -194,7 +194,7 @@
 
 + (tableMetadata *)insertFileSystemInMetadata:(NSString *)fileName fileNamePlain:(NSString *)fileNamePlain directory:(NSString *)directory activeAccount:(NSString *)activeAccount;
 
-+ (void)insertTypeFileIconName:(NSString *)fileName metadata:(tableMetadata *)metadata;
++ (void)insertTypeFileIconName:(NSString *)fileNameView metadata:(tableMetadata *)metadata;
 
 // ===== Third parts =====
 

iOSClient/Utility/CCUtility.m

@@ -932,6 +932,7 @@
     metadata.etag = etag;
     metadata.fileID = fileID;
     metadata.fileName = fileName;
+    metadata.fileNameView = fileName;
     metadata.size = size;
     metadata.status = status;
     
@@ -954,6 +955,7 @@
     metadata.fileID = itemDto.ocId;
     metadata.directoryID = directoryID;
     metadata.fileName = fileName;
+    metadata.fileNameView = fileName;
     metadata.iconName = @"";
     metadata.permissions = itemDto.permissions;
     metadata.etag = itemDto.etag;
@@ -966,9 +968,9 @@
     return metadata;
 }
 
-+ (void)insertTypeFileIconName:(NSString *)fileName metadata:(tableMetadata *)metadata
++ (void)insertTypeFileIconName:(NSString *)fileNameView metadata:(tableMetadata *)metadata
 {
-    if ([fileName isEqualToString:@"."]) {
+    if ([fileNameView isEqualToString:@"."]) {
         
         metadata.typeFile = k_metadataTypeFile_unknown;
         metadata.iconName = @"file";
@@ -979,7 +981,7 @@
         
     } else {
         
-        CFStringRef fileExtension = (__bridge CFStringRef)[fileName pathExtension];
+        CFStringRef fileExtension = (__bridge CFStringRef)[fileNameView pathExtension];
         CFStringRef fileUTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, fileExtension, NULL);
         NSString *ext = (__bridge NSString *)fileExtension;
         ext = ext.uppercaseString;
@@ -1077,6 +1079,7 @@
     metadata.fileID = fileName;
     metadata.directoryID = directory;
     metadata.fileName = fileName;
+    metadata.fileNameView = fileName;
     metadata.size = [attributes[NSFileSize] longValue];
     metadata.thumbnailExists = false;