Marino Faggiana 8 年 前
コミット
df35b5ba58

+ 2 - 2
Picker/DocumentPickerViewController.swift

@@ -332,9 +332,9 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
                 let metadataNet = CCMetadataNet.init(account: activeAccount)!
                 
                 metadataNet.action = actionDownloadFile
-                metadataNet.metadata = metadata
                 metadataNet.downloadData = false
                 metadataNet.downloadPlist = true
+                metadataNet.fileID = metadata.fileID
                 metadataNet.selector = selectorLoadPlist
                 metadataNet.serverUrl = self.serverUrl
                 metadataNet.session = k_download_session_foreground
@@ -807,7 +807,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
                 metadataNet.action = actionDownloadFile
                 metadataNet.downloadData = true
                 metadataNet.downloadPlist = false
-                metadataNet.metadata = metadata
+                metadataNet.fileID = metadata?.fileID
                 metadataNet.selector = selectorLoadFileView
                 metadataNet.serverUrl = self.serverUrl
                 metadataNet.session = k_download_session_foreground

+ 1 - 6
iOSClient/Actions/CCActions.swift

@@ -104,7 +104,6 @@ class CCActions: NSObject {
             metadataNet.delegate = delegate
             metadataNet.fileID = metadata.fileID
             metadataNet.fileNamePrint = metadata.fileNamePrint
-            metadataNet.metadata = metadata
             metadataNet.serverUrl = serverUrl
             
             // data crypto
@@ -126,7 +125,6 @@ class CCActions: NSObject {
             metadataNet.fileID = metadata.fileID
             metadataNet.fileName = metadata.fileName
             metadataNet.fileNamePrint = metadata.fileNamePrint
-            metadataNet.metadata = metadata
             metadataNet.selector = selectorDelete
             metadataNet.serverUrl = serverUrl
 
@@ -227,8 +225,8 @@ class CCActions: NSObject {
             
             metadataNet.action = actionUploadOnlyPlist
             metadataNet.delegate = delegate
+            metadataNet.fileID = metadata.fileID
             metadataNet.fileName = metadata.fileName
-            metadataNet.metadata = metadata
             metadataNet.selectorPost = selectorReadFolderForced
             metadataNet.serverUrl = serverUrl
             metadataNet.session = k_upload_session_foreground
@@ -272,7 +270,6 @@ class CCActions: NSObject {
             metadataNet.fileName = metadata.fileName
             metadataNet.fileNamePrint = metadata.fileNamePrint
             metadataNet.fileNameTo = fileName
-            metadataNet.metadata = metadata
             metadataNet.selector = selectorRename
             metadataNet.serverUrl = serverUrl
             metadataNet.serverUrlTo = serverUrl
@@ -375,7 +372,6 @@ class CCActions: NSObject {
         metadataNet.fileName = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: serverUrl, activeUrl: appDelegate.activeUrl)
         metadataNet.fileNameLocal = metadata.fileID
         metadataNet.fileNamePrint = metadata.fileNamePrint
-        metadataNet.metadata = metadata
         metadataNet.options = "m"
         metadataNet.priority = Operation.QueuePriority.low.rawValue
         metadataNet.selector = selectorDownloadThumbnail;
@@ -407,7 +403,6 @@ class CCActions: NSObject {
         metadataNet.delegate = delegate
         metadataNet.fileID = metadata.fileID
         metadataNet.fileName = CCUtility.returnFileNamePath(fromFileName: metadata.fileName, serverUrl: serverUrl, activeUrl: appDelegate.activeUrl)
-        metadataNet.metadata = metadata
         metadataNet.options = "\(favorite)"
         metadataNet.priority = Operation.QueuePriority.normal.rawValue
         metadataNet.selector = selectorAddFavorite

+ 1 - 1
iOSClient/Favorites/CCSynchronize.m

@@ -535,9 +535,9 @@
             CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
             
             metadataNet.action = actionDownloadFile;
-            metadataNet.metadata = metadata;
             metadataNet.downloadData = downloadData;
             metadataNet.downloadPlist = downloadPlist;
+            metadataNet.fileID = metadata.fileID;
             metadataNet.selector = selector;
             metadataNet.selectorPost = selectorPost;
             metadataNet.serverUrl = serverUrl;

+ 1 - 1
iOSClient/Main/CCMain.m

@@ -1608,9 +1608,9 @@
             CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
                 
             metadataNet.action = actionDownloadFile;
-            metadataNet.metadata = [CCCoreData insertEntityInMetadata:recordMetadata];
             metadataNet.downloadData = NO;
             metadataNet.downloadPlist = YES;
+            metadataNet.fileID = recordMetadata.fileID;
             metadataNet.selector = selectorLoadPlist;
             metadataNet.serverUrl = serverUrl;
             metadataNet.session = k_download_session_foreground;

+ 1 - 1
iOSClient/Move/CCMove.m

@@ -312,9 +312,9 @@
                     CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:activeAccount];
                     
                     metadataNet.action = actionDownloadFile;
-                    metadataNet.metadata = metadata;
                     metadataNet.downloadData = NO;
                     metadataNet.downloadPlist = YES;
+                    metadataNet.fileID = metadata.fileID;
                     metadataNet.selector = selectorLoadPlist;
                     metadataNet.serverUrl = _serverUrl;
                     metadataNet.session = k_download_session_foreground;

+ 1 - 1
iOSClient/Networking/CCNetworking.h

@@ -59,7 +59,7 @@
 - (void)settingSession:(NSString *)sessionDescription sessionTaskIdentifier:(NSUInteger)sessionTaskIdentifier taskStatus:(NSInteger)taskStatus;
 
 // Download
-- (void)downloadFile:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl downloadData:(BOOL)downloadData downloadPlist:(BOOL)downloadPlist selector:(NSString *)selector selectorPost:(NSString *)selectorPost session:(NSString *)session taskStatus:(NSInteger)taskStatus delegate:(id)delegate;
+- (void)downloadFile:(NSString *)fileID serverUrl:(NSString *)serverUrl downloadData:(BOOL)downloadData downloadPlist:(BOOL)downloadPlist selector:(NSString *)selector selectorPost:(NSString *)selectorPost session:(NSString *)session taskStatus:(NSInteger)taskStatus delegate:(id)delegate;
 
 // Upload
 - (void)uploadFileFromAssetLocalIdentifier:(NSString *)assetLocalIdentifier fileName:(NSString *)fileName serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated session:(NSString *)session taskStatus:(NSInteger)taskStatus selector:(NSString *)selector selectorPost:(NSString *)selectorPost errorCode:(NSInteger)errorCode delegate:(id)delegate;

+ 4 - 2
iOSClient/Networking/CCNetworking.m

@@ -475,11 +475,13 @@
 #pragma mark =====  Download =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)downloadFile:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl downloadData:(BOOL)downloadData downloadPlist:(BOOL)downloadPlist selector:(NSString *)selector selectorPost:(NSString *)selectorPost session:(NSString *)session taskStatus:(NSInteger)taskStatus delegate:(id)delegate
+- (void)downloadFile:(NSString *)fileID serverUrl:(NSString *)serverUrl downloadData:(BOOL)downloadData downloadPlist:(BOOL)downloadPlist selector:(NSString *)selector selectorPost:(NSString *)selectorPost session:(NSString *)session taskStatus:(NSInteger)taskStatus delegate:(id)delegate
 {
     // add delegate
     if (delegate)
-        [_delegates setObject:delegate forKey:metadata.fileID];
+        [_delegates setObject:delegate forKey:fileID];
+    
+    tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
     
     if (downloadData) {