fix assetLocalIdentifier

PickerFileProvider/FileProvider.swift

@@ -356,7 +356,7 @@ class FileProvider: NSFileProviderExtension, OCNetworkingDelegate, CCNetworkingD
                 _ = self.copyFile(url.path, toPath: changeDocumentPath)
                 
                 metadataNet.account = account
-                metadataNet.assetLocalIdentifier = k_assetLocalIdentifierFileProviderStorage + CCUtility.createRandomString(20)
+                metadataNet.assetLocalIdentifier = k_assetLocalIdentifierFileProviderStorage + identifier.rawValue
                 metadataNet.fileName = fileName
                 metadataNet.path = changeDocumentPath
                 metadataNet.selector = selectorUploadFile
@@ -806,7 +806,7 @@ class FileProvider: NSFileProviderExtension, OCNetworkingDelegate, CCNetworkingD
                 let metadataNet = CCMetadataNet()
                 
                 metadataNet.account = account
-                metadataNet.assetLocalIdentifier = k_assetLocalIdentifierFileProviderStorage + CCUtility.createRandomString(20)
+                metadataNet.assetLocalIdentifier = k_assetLocalIdentifierFileProviderStorage + fileID!
                 metadataNet.fileName = fileName
                 metadataNet.path = importDocumentURL!.path + "/" + metadata.fileNameView
                 metadataNet.selector = selectorUploadFile

iOSClient/Database/NCManageDatabase.swift

@@ -2200,18 +2200,7 @@ class NCManageDatabase: NSObject {
             do {
                 try realm.write {
                     
-                    var result: tableQueueUpload?
-                    
-                    if metadataNet.path == nil {
-                        
-                        result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, metadataNet.assetLocalIdentifier ,metadataNet.selector).first
-                        
-                    } else {
-                        
-                        result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND path = %@ AND selector = %@", tableAccount.account, metadataNet.assetLocalIdentifier, metadataNet.path ,metadataNet.selector).first
-                    }
-                    
-                    if result == nil {
+                    if realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, metadataNet.assetLocalIdentifier, metadataNet.selector).first == nil {
                         
                         // Add new
                         let addObject = tableQueueUpload()
@@ -2254,18 +2243,7 @@ class NCManageDatabase: NSObject {
                 
                 for metadataNet in metadatasNet {
                     
-                    var result: tableQueueUpload?
-                    
-                    if metadataNet.path == nil {
-                        
-                        result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, metadataNet.assetLocalIdentifier ,metadataNet.selector).first
-                        
-                    } else {
-                        
-                        result = realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND path = %@ AND selector = %@", tableAccount.account, metadataNet.assetLocalIdentifier, metadataNet.path ,metadataNet.selector).first
-                    }
-                    
-                    if result == nil {
+                    if realm.objects(tableQueueUpload.self).filter("account = %@ AND assetLocalIdentifier = %@ AND selector = %@", tableAccount.account, metadataNet.assetLocalIdentifier, metadataNet.selector).first == nil {
                         
                         // Add new
                         let addObject = tableQueueUpload()