add new field identifier on metadata & queueUpload

PickerFileProvider/FileProvider.swift

@@ -388,6 +388,7 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
             metadataNet.account = account
             metadataNet.assetLocalIdentifier = FILEID_IMPORT_METADATA_TEMP + metadata.directoryID + fileName
             metadataNet.fileName = fileName
+            metadataNet.identifier = CCUtility.generateRandomIdentifier()
             metadataNet.path = url.path
             metadataNet.selector = selectorUploadFile
             metadataNet.selectorPost = ""
@@ -967,6 +968,7 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
                 metadataNet.account = account
                 metadataNet.assetLocalIdentifier = FILEID_IMPORT_METADATA_TEMP + tableDirectory.directoryID + fileName
                 metadataNet.fileName = fileName
+                metadataNet.identifier = CCUtility.generateRandomIdentifier()
                 metadataNet.path = fileNamePathDirectory + "/" + fileName
                 metadataNet.selector = selectorUploadFile
                 metadataNet.selectorPost = ""

iOSClient/AutoUpload/NCAutoUpload.m

@@ -414,6 +414,7 @@
         }
         
         metadataNet.fileName = fileName;
+        metadataNet.identifier = [CCUtility generateRandomIdentifier];
         metadataNet.selector = selector;
         metadataNet.serverUrl = serverUrl;
         metadataNet.session = session;

iOSClient/Database/NCDatabase.swift

@@ -207,6 +207,7 @@ class tableMetadata: Object {
     @objc dynamic var fileName = ""
     @objc dynamic var fileNameView = ""
     @objc dynamic var iconName = ""
+    @objc dynamic var identifier = ""
     @objc dynamic var permissions = ""
     @objc dynamic var session = ""
     @objc dynamic var sessionError = ""
@@ -263,6 +264,7 @@ class tableQueueUpload: Object {
     @objc dynamic var date = NSDate()
     @objc dynamic var errorCode: Int = 0
     @objc dynamic var fileName = ""
+    @objc dynamic var identifier = ""
     @objc dynamic var lock: Bool = false
     @objc dynamic var path: String?
     @objc dynamic var selector = ""

iOSClient/Database/NCManageDatabase.swift

@@ -57,7 +57,7 @@ class NCManageDatabase: NSObject {
         let config = Realm.Configuration(
         
             fileURL: dirGroup?.appendingPathComponent("\(appDatabaseNextcloud)/\(k_databaseDefault)"),
-            schemaVersion: 21,
+            schemaVersion: 22,
             
             // 10 : Version 2.18.0
             // 11 : Version 2.18.2
@@ -71,6 +71,7 @@ class NCManageDatabase: NSObject {
             // 19 : Version 2.20.7
             // 20 : Version 2.21.0
             // 21 : Version 2.21.3
+            // 22 : Version 2.21.9
             
             migrationBlock: { migration, oldSchemaVersion in
                 // We haven’t migrated anything yet, so oldSchemaVersion == 0
@@ -2239,6 +2240,7 @@ class NCManageDatabase: NSObject {
                         addObject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
                         addObject.errorCode = metadataNet.errorCode
                         addObject.fileName = metadataNet.fileName
+                        addObject.identifier = metadataNet.identifier
                         addObject.path = metadataNet.path
                         addObject.selector = metadataNet.selector
                         
@@ -2283,6 +2285,7 @@ class NCManageDatabase: NSObject {
                         addObject.assetLocalIdentifier = metadataNet.assetLocalIdentifier
                         addObject.errorCode = metadataNet.errorCode
                         addObject.fileName = metadataNet.fileName
+                        addObject.identifier = metadataNet.identifier
                         addObject.path = metadataNet.path
                         addObject.selector = metadataNet.selector
                         

iOSClient/Main/CCMain.m

@@ -1360,6 +1360,7 @@
         
         metadataNet.assetLocalIdentifier = asset.localIdentifier;
         metadataNet.fileName = fileName;
+        metadataNet.identifier = [CCUtility generateRandomIdentifier];
         metadataNet.session = session;
         metadataNet.selector = selectorUploadFile;
         metadataNet.selectorPost = nil;

iOSClient/Networking/CCNetworking.h

@@ -107,6 +107,7 @@
 @property (nonatomic, strong) NSString *fileName;
 @property (nonatomic, strong) NSString *fileNameTo;
 @property (nonatomic, strong) NSString *fileNameView;
+@property (nonatomic, strong) NSString *identifier;
 @property (nonatomic, strong) NSString *key;
 @property (nonatomic, strong) NSString *keyCipher;
 @property (nonatomic, strong) id options;

iOSClient/Networking/CCNetworking.m

@@ -1533,6 +1533,7 @@
     [metadataNet setFileName: self.fileName];
     [metadataNet setFileNameTo: self.fileNameTo];
     [metadataNet setFileNameView: self.fileNameView];
+    [metadataNet setIdentifier: self.identifier];
     [metadataNet setKey: self.key];
     [metadataNet setKeyCipher: self.keyCipher];
     [metadataNet setOptions: self.options];