marinofaggiana 4 年之前
父節點
當前提交
7809bb31c3
共有 2 個文件被更改,包括 14 次插入7 次删除
  1. 13 6
      iOSClient/Database/NCManageDatabase.swift
  2. 1 1
      iOSClient/Utility/CCUtility.m

+ 13 - 6
iOSClient/Database/NCManageDatabase.swift

@@ -249,6 +249,10 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Account
     
+    @objc func copyObject(account: tableAccount) -> tableAccount {
+        return tableAccount.init(value: account)
+    }
+    
     @objc func addAccount(_ account: String, url: String, user: String, password: String) {
 
         let realm = try! Realm()
@@ -1102,6 +1106,10 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Directory
     
+    @objc func copyObject(directory: tableDirectory) -> tableDirectory {
+        return tableDirectory.init(value: directory)
+    }
+    
     @discardableResult
     @objc func addDirectory(encrypted: Bool, favorite: Bool, ocId: String, fileId: String, etag: String?, permissions: String?, serverUrl: String, richWorkspace: String?, account: String) -> tableDirectory? {
         
@@ -1582,6 +1590,10 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table LocalFile
     
+    @objc func copyObject(localFile: tableLocalFile) -> tableLocalFile {
+        return tableLocalFile.init(value: localFile)
+    }
+    
     @discardableResult
     @objc func addLocalFile(metadata: tableMetadata) -> tableLocalFile? {
         
@@ -1710,7 +1722,7 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Metadata
     
-    @objc func initNewMetadata(_ metadata: tableMetadata) -> tableMetadata {
+    @objc func copyObject(metadata: tableMetadata) -> tableMetadata {
         return tableMetadata.init(value: metadata)
     }
     
@@ -2030,11 +2042,6 @@ class NCManageDatabase: NSObject {
         return tableMetadata.init(value: metadata)
     }
     
-    @objc func copyMetadata(_ object: tableMetadata) -> tableMetadata? {
-        
-        return tableMetadata.init(value: object)
-    }
-    
     @objc func setMetadataSession(_ session: String?, sessionError: String?, sessionSelector: String?, sessionTaskIdentifier: Int, status: Int, predicate: NSPredicate) {
         
         let realm = try! Realm()

+ 1 - 1
iOSClient/Utility/CCUtility.m

@@ -1403,7 +1403,7 @@
 
 + (void)extractImageVideoFromAssetLocalIdentifierForUpload:(tableMetadata *)metadata notification:(BOOL)notification completion:(void(^)(tableMetadata *newMetadata, NSString* fileNamePath))completion
 {
-    tableMetadata *newMetadata = [[NCManageDatabase sharedInstance] initNewMetadata:metadata];
+    tableMetadata *newMetadata = [[NCManageDatabase sharedInstance] copyObjectWithMetadata:metadata];
     PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:@[metadata.assetLocalIdentifier] options:nil];
     if (!result.count) {
         if (notification) {