change name function

Picker/DocumentPickerViewController.swift

@@ -420,7 +420,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         recordMetadata = metadata
         
         // Save fileID for PickerFileProvide
-        CCUtility.setFileIDPicker(metadata.fileID)
+        CCUtility.setFileIDExt(metadata.fileID)
         
         switch selector {
             
@@ -561,6 +561,10 @@ extension DocumentPickerViewController {
                     let fileSize = (try! FileManager.default.attributesOfItem(atPath: sourceURL.path)[FileAttributeKey.size] as! NSNumber).uint64Value
                     
                     if fileSize == 0 {
+                        
+                        CCUtility.setFileIDExt("NULL")
+                        CCUtility.setServerUrlExt(self!.serverUrl)
+
                         self?.dismissGrantingAccess(to: self?.destinationURL)
                     } else {
                     

PickerFileProvider/FileProvider.swift

@@ -101,7 +101,7 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
         
         let directoryUser = CCUtility.getDirectoryActiveUser(account.user, activeUrl: account.url)
         
-        guard let fileID = CCUtility.getFileIDPicker() else {
+        guard let fileID = CCUtility.getFileIDExt() else {
             self.stopProvidingItem(at: url)
             return
         }
@@ -135,12 +135,22 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
             return
         }
 
-        // Prepare for send Metadata
-        metadata.fileID = uploadID
-        metadata.sessionID = uploadID
-        metadata.session = k_upload_session
-        metadata.sessionTaskIdentifier = Int(k_taskIdentifierWaitStart)
-        _ = NCManageDatabase.sharedInstance.updateMetadata(metadata)
+        if fileID == "NULL" {
+            
+            let serverUrl = CCUtility.getServerUrlExt()
+                
+            CCNetworking.shared().settingDelegate(self)
+            CCNetworking.shared().uploadFile(fileName, serverUrl: serverUrl, cryptated: false, onlyPlist: false, session: k_upload_session, taskStatus: Int(k_taskStatusResume), selector: nil, selectorPost: nil, errorCode: 0, delegate: self)
+            
+        } else {
+        
+            // Prepare for send Metadata
+            metadata.fileID = uploadID
+            metadata.sessionID = uploadID
+            metadata.session = k_upload_session
+            metadata.sessionTaskIdentifier = Int(k_taskIdentifierWaitStart)
+            _ = NCManageDatabase.sharedInstance.updateMetadata(metadata)
+        }
         
         self.stopProvidingItem(at: url)
     }

Share/ShareViewController.m

@@ -77,31 +77,31 @@
         }
 
         
-        if ([_activeAccount isEqualToString:[CCUtility getActiveAccountShareExt]]) {
+        if ([_activeAccount isEqualToString:[CCUtility getActiveAccountExt]]) {
             
             // load
             
-            _serverUrl = [CCUtility getServerUrlShareExt];
+            _serverUrl = [CCUtility getServerUrlExt];
             
-            _destinyFolderButton.title = [NSString stringWithFormat:NSLocalizedString(@"_destiny_folder_", nil), [CCUtility getTitleServerUrlShareExt]];
+            _destinyFolderButton.title = [NSString stringWithFormat:NSLocalizedString(@"_destiny_folder_", nil), [CCUtility getTitleServerUrlExt]];
             
             if (_isCryptoCloudMode)
-                _localCryptated = [CCUtility getCryptatedShareExt];
+                _localCryptated = [CCUtility getCryptatedExt];
             
         } else {
             
             // Default settings
             
-            [CCUtility setActiveAccountShareExt:self.activeAccount];
+            [CCUtility setActiveAccountExt:self.activeAccount];
 
             _serverUrl  = [CCUtility getHomeServerUrlActiveUrl:self.activeUrl];
-            [CCUtility setServerUrlShareExt:_serverUrl];
+            [CCUtility setServerUrlExt:_serverUrl];
 
             _destinyFolderButton.title = [NSString stringWithFormat:NSLocalizedString(@"_destiny_folder_", nil), NSLocalizedString(@"_home_", nil)];
-            [CCUtility setTitleServerUrlShareExt:NSLocalizedString(@"_home_", nil)];
+            [CCUtility setTitleServerUrlExt:NSLocalizedString(@"_home_", nil)];
 
             _localCryptated = NO;
-            [CCUtility setCryptatedShareExt:NO];
+            [CCUtility setCryptatedExt:NO];
         }
     }
 
@@ -213,14 +213,14 @@
     
     if (title) {
         self.destinyFolderButton.title = [NSString stringWithFormat:NSLocalizedString(@"_destiny_folder_", nil), title];
-        [CCUtility setTitleServerUrlShareExt:title];
+        [CCUtility setTitleServerUrlExt:title];
     } else {
         self.destinyFolderButton.title = [NSString stringWithFormat:NSLocalizedString(@"_destiny_folder_", nil), NSLocalizedString(@"_home_", nil)];
-        [CCUtility setTitleServerUrlShareExt:NSLocalizedString(@"_home_", nil)];
+        [CCUtility setTitleServerUrlExt:NSLocalizedString(@"_home_", nil)];
     }
     
-    [CCUtility setActiveAccountShareExt:self.activeAccount];
-    [CCUtility setServerUrlShareExt:_serverUrl];
+    [CCUtility setActiveAccountExt:self.activeAccount];
+    [CCUtility setServerUrlExt:_serverUrl];
 }
 
 - (IBAction)destinyFolderButtonTapped:(UIBarButtonItem *)sender
@@ -281,7 +281,7 @@
     if (self.localCryptated) self.localCryptated = NO;
     else self.localCryptated = YES;
     
-    [CCUtility setCryptatedShareExt:self.localCryptated];
+    [CCUtility setCryptatedExt:self.localCryptated];
 
     [self navigationBarToolBar];
 }

iOSClient/Utility/CCUtility.h

@@ -70,12 +70,11 @@
 
 + (void)setIntro:(NSString *)version;
 
-+ (void)setActiveAccountShareExt:(NSString *)activeAccount;
-+ (void)setCryptatedShareExt:(BOOL)cryptated;
-+ (void)setServerUrlShareExt:(NSString *)serverUrl;
-+ (void)setTitleServerUrlShareExt:(NSString *)titleServerUrl;
-
-+ (void)setFileIDPicker:(NSString *)fileID;
++ (void)setActiveAccountExt:(NSString *)activeAccount;
++ (void)setCryptatedExt:(BOOL)cryptated;
++ (void)setServerUrlExt:(NSString *)serverUrl;
++ (void)setTitleServerUrlExt:(NSString *)titleServerUrl;
++ (void)setFileIDExt:(NSString *)fileID;
 
 + (void)setEmail:(NSString *)email;
 
@@ -115,12 +114,11 @@
 + (BOOL)getIntro:(NSString *)version;
 + (NSString *)getIncrementalNumber;
 
-+ (NSString *)getActiveAccountShareExt;
-+ (BOOL)getCryptatedShareExt;
-+ (NSString *)getServerUrlShareExt;
-+ (NSString *)getTitleServerUrlShareExt;
-
-+ (NSString *)getFileIDPicker;
++ (NSString *)getActiveAccountExt;
++ (BOOL)getCryptatedExt;
++ (NSString *)getServerUrlExt;
++ (NSString *)getTitleServerUrlExt;
++ (NSString *)getFileIDExt;
 
 + (NSString *)getEmail;
 

iOSClient/Utility/CCUtility.m

@@ -150,30 +150,30 @@
     [UICKeyChainStore setString:@"true" forKey:version service:k_serviceShareKeyChain];
 }
 
-+ (void)setActiveAccountShareExt:(NSString *)activeAccount
++ (void)setActiveAccountExt:(NSString *)activeAccount
 {
-    [UICKeyChainStore setString:activeAccount forKey:@"activeAccountShareExt" service:k_serviceShareKeyChain];
+    [UICKeyChainStore setString:activeAccount forKey:@"activeAccountExt" service:k_serviceShareKeyChain];
 }
 
-+ (void)setCryptatedShareExt:(BOOL)cryptated
++ (void)setCryptatedExt:(BOOL)cryptated
 {
     NSString *sCryptated = (cryptated) ? @"true" : @"false";
-    [UICKeyChainStore setString:sCryptated forKey:@"cryptatedShareExt" service:k_serviceShareKeyChain];
+    [UICKeyChainStore setString:sCryptated forKey:@"cryptatedExt" service:k_serviceShareKeyChain];
 }
 
-+ (void)setServerUrlShareExt:(NSString *)serverUrl
++ (void)setServerUrlExt:(NSString *)serverUrl
 {
-    [UICKeyChainStore setString:serverUrl forKey:@"serverUrlShareExt" service:k_serviceShareKeyChain];
+    [UICKeyChainStore setString:serverUrl forKey:@"serverUrlExt" service:k_serviceShareKeyChain];
 }
 
-+ (void)setTitleServerUrlShareExt:(NSString *)titleServerUrl
++ (void)setTitleServerUrlExt:(NSString *)titleServerUrl
 {
-    [UICKeyChainStore setString:titleServerUrl forKey:@"titleServerUrlShareExt" service:k_serviceShareKeyChain];
+    [UICKeyChainStore setString:titleServerUrl forKey:@"titleServerUrlExt" service:k_serviceShareKeyChain];
 }
 
-+ (void)setFileIDPicker:(NSString *)fileID
++ (void)setFileIDExt:(NSString *)fileID
 {
-    [UICKeyChainStore setString:fileID forKey:@"fileIDPicker" service:k_serviceShareKeyChain];
+    [UICKeyChainStore setString:fileID forKey:@"fileIDExt" service:k_serviceShareKeyChain];
 }
 
 + (void)setEmail:(NSString *)email
@@ -350,29 +350,29 @@
     return [NSString stringWithFormat:@"%04ld", number];
 }
 
-+ (NSString *)getActiveAccountShareExt
++ (NSString *)getActiveAccountExt
 {
-    return [UICKeyChainStore stringForKey:@"activeAccountShareExt" service:k_serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"activeAccountExt" service:k_serviceShareKeyChain];
 }
 
-+ (BOOL)getCryptatedShareExt
++ (BOOL)getCryptatedExt
 {
-    return [[UICKeyChainStore stringForKey:@"cryptatedShareExt" service:k_serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"cryptatedExt" service:k_serviceShareKeyChain] boolValue];
 }
 
-+ (NSString *)getServerUrlShareExt
++ (NSString *)getServerUrlExt
 {
-    return [UICKeyChainStore stringForKey:@"serverUrlShareExt" service:k_serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"serverUrlExt" service:k_serviceShareKeyChain];
 }
 
-+ (NSString *)getTitleServerUrlShareExt
++ (NSString *)getTitleServerUrlExt
 {
-    return [UICKeyChainStore stringForKey:@"titleServerUrlShareExt" service:k_serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"titleServerUrlExt" service:k_serviceShareKeyChain];
 }
 
-+ (NSString *)getFileIDPicker
++ (NSString *)getFileIDExt
 {
-    return [UICKeyChainStore stringForKey:@"fileIDPicker" service:k_serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"fileIDExt" service:k_serviceShareKeyChain];
 }
 
 + (NSString *)getEmail