Marino Faggiana 7 years ago
parent
commit
9dff8f445c
3 changed files with 18 additions and 13 deletions
  1. 13 6
      iOSClient/Main/CCMain.m
  2. 3 6
      iOSClient/Networking/CCNetworking.m
  3. 2 1
      iOSClient/Utility/CCUtility.m

+ 13 - 6
iOSClient/Main/CCMain.m

@@ -1523,13 +1523,19 @@
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         
             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];
+            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]) {
@@ -1537,13 +1543,14 @@
                 if ([((OCnetworking *)operation).metadataNet.selector isEqualToString:selectorLoadPlist])
                     countSelectorLoadPlist++;
             }
-        
+            
             if ((countSelectorLoadPlist == 0 || countSelectorLoadPlist % k_maxConcurrentOperation == 0) && [metadata.directoryID isEqualToString:[[NCManageDatabase sharedInstance] getDirectoryID:_serverUrl]]) {
             
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
                 });
             }
+            
         });
     }
     

+ 3 - 6
iOSClient/Networking/CCNetworking.m

@@ -652,13 +652,10 @@
             else destinationFilePath = [NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl], metadata.fileID];
         }
         
-        @autoreleasepool {
-            
-            NSURL *destinationURL = [NSURL fileURLWithPath:destinationFilePath];
+        NSURL *destinationURL = [NSURL fileURLWithPath:destinationFilePath];
         
-            [[NSFileManager defaultManager] removeItemAtURL:destinationURL error:NULL];
-            [[NSFileManager defaultManager] copyItemAtURL:location toURL:destinationURL error:nil];
-        }
+        [[NSFileManager defaultManager] removeItemAtURL:destinationURL error:NULL];
+        [[NSFileManager defaultManager] copyItemAtURL:location toURL:destinationURL error:nil];
     }
 }
 

+ 2 - 1
iOSClient/Utility/CCUtility.m

@@ -936,7 +936,8 @@
         if ([[NSFileManager defaultManager] fileExistsAtPath:temp]) fileNamePlist = temp;
     }
     
-    if (!fileNamePlist) return metadata;
+    if (!fileNamePlist)
+        return nil;
     
     NSMutableDictionary *data = [[NSMutableDictionary alloc] initWithContentsOfFile:fileNamePlist];
     NSString *title =  [data objectForKey:@"title"];