Activity Upload automatic

iOSClient/AppDelegate.m

@@ -1164,12 +1164,7 @@
     if ([selector isEqualToString:selectorUploadAutomaticAll]) {
     
         NSUInteger count = [TableMetadata MR_countOfEntitiesWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (sessionSelector == %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", app.activeAccount, selectorUploadAutomaticAll,k_taskIdentifierError, k_taskIdentifierError]];
-        
-#ifdef DEBUG
-        NSArray *records = [[NSArray alloc] init];
-        records = [TableMetadata MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (sessionSelector == %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", app.activeAccount, selectorUploadAutomaticAll,k_taskIdentifierError, k_taskIdentifierError]];
-#endif
-        
+                
         if (count >= 10) {
             
             [app messageNotification:@"_error_" description:@"_too_errors_automatic_all_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];

iOSClient/FileSystem/CCCoreData.h

@@ -187,7 +187,7 @@
 
 // ===== Automatic Upload =====
 
-+ (void)addTableAutomaticUpload:(CCMetadataNet *)metadataNet account:(NSString *)account context:(NSManagedObjectContext *)context;
++ (void)addTableAutomaticUpload:(CCMetadataNet *)metadataNet account:(NSString *)account;
 + (CCMetadataNet *)getTableAutomaticUploadForAccount:(NSString *)account selector:(NSString *)selector context:(NSManagedObjectContext *)context;
 + (NSUInteger)countTableAutomaticUploadForAccount:(NSString *)account selector:(NSString *)selector;
 

iOSClient/FileSystem/CCCoreData.m

@@ -1501,10 +1501,9 @@
 #pragma mark ===== Automatic Upload =====
 #pragma --------------------------------------------------------------------------------------------
 
-+ (void)addTableAutomaticUpload:(CCMetadataNet *)metadataNet account:(NSString *)account context:(NSManagedObjectContext *)context
++ (void)addTableAutomaticUpload:(CCMetadataNet *)metadataNet account:(NSString *)account
 {
-    if (context == nil)
-        context = [NSManagedObjectContext MR_context];
+    NSManagedObjectContext *context = [NSManagedObjectContext MR_context];
     
     // Delete record if exists
     NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@) AND (fileName == %@) AND (serverUrl == %@) AND (selector == %@)", account, metadataNet.fileName, metadataNet.serverUrl, metadataNet.selector];
@@ -1544,7 +1543,7 @@
         metadataNet.selectorPost = record.selectorPost;
         metadataNet.serverUrl = record.serverUrl;
         metadataNet.session = record.session;
-        metadataNet.taskStatus = k_taskStatusResume;                          // Default
+        metadataNet.taskStatus = k_taskStatusResume;                        // Default
         
         [record MR_deleteEntityInContext:context];                          // Remove record
         [context MR_saveToPersistentStoreAndWait];

iOSClient/Networking/CCNetworking.m

@@ -1170,7 +1170,7 @@
             [[NSFileManager defaultManager] moveItemAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, fileNamePrint] toPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, sessionID] error:nil];
     }
     
-    // file exists ?
+    // file NOT exists
     if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, fileNameForUpload]] == NO) {
         
         dispatch_async(dispatch_get_main_queue(), ^{

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1093,6 +1093,9 @@
     if ([newItemsToUpload count] == 0)
         return;
     
+    // Activity
+    [CCCoreData addActivityFile:@"" action:@"Automatic Upload" note:[NSString stringWithFormat:@"Number : %lu", [newItemsToUpload count]] type:k_activityTypeInfo verbose:k_activityVerboseDebug account:app.activeAccount];
+    
     // STOP new request : initStateCameraUpload
     //_AutomaticCameraUploadInProgress = YES;
     
@@ -1144,13 +1147,18 @@
     // verify/create folder Camera Upload, if error exit
     if(![self automaticCreateFolder:folderPhotos]) {
         
+        NSString *description = NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil);
+        
         // Full Upload ?
         if (assetsFull)
-            [app messageNotification:@"_error_" description:NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil) visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+            [app messageNotification:@"_error_" description:description visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         
         // START new request : initStateCameraUpload
         //_AutomaticCameraUploadInProgress = NO;
         
+        // Activity
+        [CCCoreData addActivityFile:@"" action:@"Automatic Upload" note:description type:k_activityTypeFailure verbose:k_activityVerboseDebug account:app.activeAccount];
+        
         return;
     }
     
@@ -1166,6 +1174,9 @@
                 if (assetsFull)
                     [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
                 
+                // Activity
+                [CCCoreData addActivityFile:@"" action:@"Automatic Upload" note:NSLocalizedString(@"_error_createsubfolders_upload_",nil) type:k_activityTypeFailure verbose:k_activityVerboseDebug account:app.activeAccount];
+                
                 return;
             }
         }
@@ -1217,7 +1228,13 @@
         metadataNet.session = session;
         metadataNet.taskStatus = k_taskStatusResume;
         
-        [CCCoreData addTableAutomaticUpload:metadataNet account:app.activeAccount context:nil];
+        [CCCoreData addTableAutomaticUpload:metadataNet account:app.activeAccount];
+        
+        // Activity
+        NSString *media = @"";
+        if (assetMediaType == PHAssetMediaTypeImage) media = @"Image";
+        if (assetMediaType == PHAssetMediaTypeVideo) media = @"Video";
+        [CCCoreData addActivityFile:[NSString stringWithFormat:@"%@/%@", serverUrl, fileName] action:@"Automatic Upload" note:[NSString stringWithFormat:@"Add TableAutomaticUpload on Session : %@, Set Data asset %@", session, media] type:k_activityTypeInfo verbose:k_activityVerboseDebug account:app.activeAccount];
         
         // Upldate Camera Upload data  
         if ([metadataNet.selector isEqualToString:selectorUploadAutomatic])