Marino Faggiana 7 years ago
parent
commit
6f0954edce
2 changed files with 13 additions and 20 deletions
  1. 0 18
      iOSClient/Main/CCMain.m
  2. 13 2
      iOSClient/Networking/CCNetworking.m

+ 0 - 18
iOSClient/Main/CCMain.m

@@ -1504,9 +1504,6 @@
     // download and view a template
     if ([selector isEqualToString:selectorLoadModelView]) {
         
-        metadata = [CCUtility insertInformationPlist:metadata directoryUser:app.directoryUser];
-        metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:app.activeUrl];
-        
         // se è un template aggiorniamo anche nel FileSystem
         if ([metadata.type isEqualToString: k_metadataType_template]) {
             [[NCManageDatabase sharedInstance] setLocalFileWithFileID:metadata.fileID date:metadata.date exifDate:nil exifLatitude:nil exifLongitude:nil fileName:nil fileNamePrint:metadata.fileNamePrint];
@@ -1522,20 +1519,6 @@
         
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         
-            metadata = [CCUtility insertInformationPlist:metadata directoryUser:app.directoryUser];
-            
-            if (metadata) {
-                
-                metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:app.activeUrl];
-            
-                // se è un template aggiorniamo anche nel FileSystem
-                if ([metadata.type isEqualToString: k_metadataType_template]) {
-                    [[NCManageDatabase sharedInstance] setLocalFileWithFileID:metadata.fileID date:metadata.date exifDate:nil exifLatitude:nil exifLongitude:nil fileName:nil fileNamePrint:metadata.fileNamePrint];
-                }
-            } else {
-                NSLog(@"x");
-            }
-            
             long countSelectorLoadPlist = 0;
         
             for (NSOperation *operation in [app.netQueue operations]) {
@@ -1550,7 +1533,6 @@
                     [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
                 });
             }
-            
         });
     }
     

+ 13 - 2
iOSClient/Networking/CCNetworking.m

@@ -690,7 +690,7 @@
         
     } else {
         
-        tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+        __block tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
         if (!metadata) {
             NSLog(@"metadata not found");
             return;
@@ -706,7 +706,18 @@
         
         if (sessionTaskIdentifier == k_taskIdentifierDone && sessionTaskIdentifierPlist == k_taskIdentifierDone) {
             
-            [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
+            metadata.session = @"";
+            metadata.sessionError = @"";
+            metadata.sessionSelector = @"";
+            metadata.sessionSelectorPost = @"";
+            metadata.sessionTaskIdentifier = k_taskIdentifierDone;
+            metadata.sessionTaskIdentifierPlist = k_taskIdentifierDone;
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                if([selector isEqualToString:selectorLoadPlist] || [selector isEqualToString:selectorLoadModelView])
+                    metadata = [CCUtility insertInformationPlist:metadata directoryUser:_directoryUser];
+                metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:_activeUrl];
+            });
             
         } else {