OPTION_AUTOMATIC_UPLOAD

iOSClient/FileSystem/CCCoreData.m

@@ -39,17 +39,29 @@
         
     record.account = account;
     record.active = [NSNumber numberWithBool:NO];
-        
+    
+#ifdef OPTION_AUTOMATIC_UPLOAD_ENABLE
+    record.cameraUpload = [NSNumber numberWithBool:YES];
+    record.cameraUploadPhoto = [NSNumber numberWithBool:YES];
+    record.cameraUploadVideo = [NSNumber numberWithBool:YES];
+    
+    record.cameraUploadDatePhoto = [NSDate date];
+    record.cameraUploadDateVideo = [NSDate date];
+
+    record.cameraUploadWWAnPhoto = [NSNumber numberWithBool:NO];
+    record.cameraUploadWWAnVideo = [NSNumber numberWithBool:YES];
+#else
     record.cameraUpload = [NSNumber numberWithBool:NO];
     record.cameraUploadPhoto = [NSNumber numberWithBool:NO];
     record.cameraUploadVideo = [NSNumber numberWithBool:NO];
-        
-    record.cameraUploadCryptatedPhoto = [NSNumber numberWithBool:NO];
-    record.cameraUploadCryptatedVideo = [NSNumber numberWithBool:NO];
-        
+    
     record.cameraUploadWWAnPhoto = [NSNumber numberWithBool:NO];
     record.cameraUploadWWAnVideo = [NSNumber numberWithBool:NO];
-        
+#endif
+    
+    record.cameraUploadCryptatedPhoto = [NSNumber numberWithBool:NO];
+    record.cameraUploadCryptatedVideo = [NSNumber numberWithBool:NO];
+
     record.optimization = [NSDate date];
     record.password = password;
     record.url = url;

iOSClient/Main/CCSplit.m

@@ -142,28 +142,6 @@
 
 - (void)loginSuccess:(NSInteger)loginType
 {
-    // ---------------------------------------
-    //  *** DEFAULT OPTION ***
-    // ---------------------------------------
-    
-#ifdef OPTION_AUTOMATIC_UPLOAD_ENABLE
-    
-    [CCCoreData setCameraUpload:YES activeAccount:app.activeAccount];
-    
-    // Default parameter
-    [CCCoreData setCameraUploadFolderName:nil activeAccount:app.activeAccount];
-    [CCCoreData setCameraUploadFolderPath:nil activeUrl:app.activeUrl activeAccount:app.activeAccount];
-    
-    [CCCoreData setCameraUploadPhoto:YES activeAccount:app.activeAccount];
-    [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
-    
-    [CCCoreData setCameraUploadVideo:YES activeAccount:app.activeAccount];
-    [CCCoreData setCameraUploadWWanVideo:YES activeAccount:app.activeAccount];
-    [CCCoreData setCameraUploadDateVideo:[NSDate date]];
-    
-    [CCCoreData setCameraUploadCreateSubfolderActiveAccount:YES activeAccount:app.activeAccount];
-#endif
-
     [[NSNotificationCenter defaultCenter] postNotificationName:@"initializeMain" object:nil];
 }