Browse Source

Remove old updateMetadataCameraUploadWithDirectoryID

Marino Faggiana 8 years ago
parent
commit
9d1c9e6c26
3 changed files with 1 additions and 20 deletions
  1. 0 1
      iOSClient/FileSystem/CCCoreData.h
  2. 0 15
      iOSClient/FileSystem/CCCoreData.m
  3. 1 4
      iOSClient/Main/CCMain.m

+ 0 - 1
iOSClient/FileSystem/CCCoreData.h

@@ -104,7 +104,6 @@
 + (void)deleteMetadataWithPredicate:(NSPredicate *)predicate;
 + (void)moveMetadata:(NSString *)fileName directoryID:(NSString *)directoryID directoryIDTo:(NSString *)directoryIDTo activeAccount:(NSString *)activeAccount;
 + (void)updateMetadata:(CCMetadata *)metadata predicate:(NSPredicate *)predicate activeAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud context:(NSManagedObjectContext *)context;
-+ (void)updateMetadataCameraUploadWithDirectoryID:(NSString *)directoryID activeAccount:(NSString *)activeAccount;
 + (void)setMetadataSession:(NSString *)session sessionError:(NSString *)sessionError sessionSelector:(NSString *)sessionSelector sessionSelectorPost:(NSString *)sessionSelectorPost sessionTaskIdentifier:(NSInteger)sessionTaskIdentifier sessionTaskIdentifierPlist:(NSInteger)sessionTaskIdentifierPlist predicate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context;
 
 + (NSArray *)getTableMetadataWithPredicate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context;

+ 0 - 15
iOSClient/FileSystem/CCCoreData.m

@@ -691,21 +691,6 @@
     }
 }
 
-+ (void)updateMetadataCameraUploadWithDirectoryID:(NSString *)directoryID activeAccount:(NSString *)activeAccount
-{
-    [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
-        
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (sessionCameraUpload == 1)", activeAccount];
-        NSArray *records = [TableMetadata MR_findAllWithPredicate:predicate inContext:localContext];
-    
-        for (TableMetadata *record in records)
-            record.directoryID = directoryID;
-        
-        // Aggiorniamo la data nella directory (ottimizzazione v 2.10)
-        [self setDateReadDirectoryID:directoryID activeAccount:activeAccount];
-    }];
-}
-
 + (void)setMetadataSession:(NSString *)session sessionError:(NSString *)sessionError sessionSelector:(NSString *)sessionSelector sessionSelectorPost:(NSString *)sessionSelectorPost sessionTaskIdentifier:(NSInteger)sessionTaskIdentifier sessionTaskIdentifierPlist:(NSInteger)sessionTaskIdentifierPlist predicate:(NSPredicate *)predicate context:(NSManagedObjectContext *)context
 {
     if (context == nil)

+ 1 - 4
iOSClient/Main/CCMain.m

@@ -2225,10 +2225,7 @@
 {
     [_hud hideHud];
     
-    NSString *directoryIDReturn = [CCCoreData addDirectory:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] date:[NSDate date] permissions:nil activeAccount:app.activeAccount];
-    
-    if ([metadataNet.options isEqualToString:@"folderCameraUpload"] && directoryIDReturn)
-        [CCCoreData updateMetadataCameraUploadWithDirectoryID:directoryIDReturn activeAccount:app.activeAccount];
+    [CCCoreData addDirectory:[NSString stringWithFormat:@"%@/%@", metadataNet.serverUrl, metadataNet.fileName] date:[NSDate date] permissions:nil activeAccount:app.activeAccount];
     
     // Load Folder or the Datasource
     if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced]) {