clear code

iOSClient/AppDelegate.m

@@ -1607,6 +1607,9 @@
         for (TableAccount *account in listAccount)
             [[NCManageDatabase sharedInstance] addTableAccountFromCoredata:account];
         
+        // Align Photo Library
+        [[NCAutoUpload sharedInstance] alignPhotoLibrary];
+        
         // Most important is done
         [CCUtility setVersionCryptoCloud];
 

iOSClient/AutoUpload/NCAutoUpload.m

@@ -639,12 +639,12 @@
             
             NSMutableArray *newAssets =[NSMutableArray new];
             
-            if (account.autoUploadPhoto && account.autoUploadVideo) {
+            if (account.autoUploadImage && account.autoUploadVideo) {
                 
                 predicate = [NSCompoundPredicate orPredicateWithSubpredicates:@[predicateImage, predicateVideo]];
                 image = YES; video = YES;
                 
-            } else if (account.autoUploadPhoto) {
+            } else if (account.autoUploadImage) {
                 
                 predicate = predicateImage;
                 image = YES;
@@ -710,10 +710,12 @@
         
         tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
 
-        PHFetchResult *assets = [self getCameraRollAssets:account assetsFull:YES];
-        [[NCManageDatabase sharedInstance] addPhotoLibrary:(NSArray *)assets];
-        
-        NSLog(@"Align Photo Library %lu", [assets count]);
+        if (account.autoUpload) {
+            PHFetchResult *assets = [self getCameraRollAssets:account assetsFull:YES];
+            [[NCManageDatabase sharedInstance] addPhotoLibrary:(NSArray *)assets];
+            
+            NSLog(@"Align Photo Library %lu", [assets count]);
+        }
     });
 }
 

iOSClient/Database/NCDatabase.swift

@@ -34,7 +34,7 @@ class tableAccount: Object {
     dynamic var autoUploadFileName = ""
     dynamic var autoUploadDirectory = ""
     dynamic var autoUploadFull: Bool = false
-    dynamic var autoUploadPhoto: Bool = false
+    dynamic var autoUploadImage: Bool = false
     dynamic var autoUploadVideo: Bool = false
     dynamic var autoUploadWWAnPhoto: Bool = false
     dynamic var autoUploadWWAnVideo: Bool = false

iOSClient/Database/NCManageDatabase.swift

@@ -133,7 +133,7 @@ class NCManageDatabase: NSObject {
         if NCBrandOptions.sharedInstance.use_default_auto_upload {
                 
             addAccount.autoUpload = true
-            addAccount.autoUploadPhoto = true
+            addAccount.autoUploadImage = true
             addAccount.autoUploadVideo = true
 
             addAccount.autoUploadWWAnVideo = true
@@ -318,8 +318,8 @@ class NCManageDatabase: NSObject {
                 result?.autoUploadCreateSubfolder = state
             case "autoUploadFull":
                 result?.autoUploadFull = state
-            case "autoUploadPhoto":
-                result?.autoUploadPhoto = state
+            case "autoUploadImage":
+                result?.autoUploadImage = state
             case "autoUploadVideo":
                 result?.autoUploadVideo = state
             case "autoUploadWWAnPhoto":
@@ -2280,7 +2280,7 @@ class NCManageDatabase: NSObject {
                 addAccount.autoUploadFull = true
             }
             if table.cameraUploadPhoto == 1 {
-                addAccount.autoUploadPhoto = true
+                addAccount.autoUploadImage = true
             }
             if table.cameraUploadVideo == 1 {
                 addAccount.autoUploadVideo = true

iOSClient/Settings/CCManageAutoUpload.m

@@ -85,9 +85,9 @@
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadPhoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_autoupload_photos_", nil)];
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"autoUploadImage" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_autoupload_photos_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
-    if (tableAccount.autoUploadPhoto) row.value = @1;
+    if (tableAccount.autoUploadImage) row.value = @1;
     else row.value = @0;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
@@ -217,8 +217,8 @@
             [[NCManageDatabase sharedInstance] setAccountAutoUploadDirectory:nil activeUrl:app.activeUrl];
             
             // verifichiamo che almeno uno dei servizi (foto video) siano attivi, in caso contrario attiviamo le foto
-            if (account.autoUploadPhoto == NO && account.autoUploadVideo == NO) {
-                [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadPhoto" state:YES];
+            if (account.autoUploadImage == NO && account.autoUploadVideo == NO) {
+                [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadImage" state:YES];
                 [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadVideo" state:YES];
             }
             
@@ -283,9 +283,9 @@
         }
     }
 
-    if ([rowDescriptor.tag isEqualToString:@"autoUploadPhoto"]) {
+    if ([rowDescriptor.tag isEqualToString:@"autoUploadImage"]) {
         
-        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadPhoto" state:[[rowDescriptor.value valueData] boolValue]];
+        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadImage" state:[[rowDescriptor.value valueData] boolValue]];
 
         if ([[rowDescriptor.value valueData] boolValue] == YES)
             [[NCAutoUpload sharedInstance] alignPhotoLibrary];
@@ -326,7 +326,7 @@
     
     XLFormRowDescriptor *rowAutoUpload = [self.form formRowWithTag:@"autoUpload"];
     
-    XLFormRowDescriptor *rowAutoUploadPhoto = [self.form formRowWithTag:@"autoUploadPhoto"];
+    XLFormRowDescriptor *rowAutoUploadImage = [self.form formRowWithTag:@"autoUploadImage"];
     XLFormRowDescriptor *rowAutoUploadWWAnPhoto = [self.form formRowWithTag:@"autoUploadWWAnPhoto"];
     
     XLFormRowDescriptor *rowAutoUploadVideo = [self.form formRowWithTag:@"autoUploadVideo"];
@@ -345,8 +345,8 @@
     if (tableAccount.autoUpload)
         [rowAutoUpload setValue:@1]; else [rowAutoUpload setValue:@0];
     
-    if (tableAccount.autoUploadPhoto)
-        [rowAutoUploadPhoto setValue:@1]; else [rowAutoUploadPhoto setValue:@0];
+    if (tableAccount.autoUploadImage)
+        [rowAutoUploadImage setValue:@1]; else [rowAutoUploadImage setValue:@0];
     
     if (tableAccount.autoUploadWWAnPhoto)
         [rowAutoUploadWWAnPhoto setValue:@1]; else [rowAutoUploadWWAnPhoto setValue:@0];
@@ -368,7 +368,7 @@
     
     // - HIDDEN ---------------------
     
-    rowAutoUploadPhoto.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
+    rowAutoUploadImage.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
     rowAutoUploadWWAnPhoto.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];
     
     rowAutoUploadVideo.hidden = [NSString stringWithFormat:@"$%@==0", @"autoUpload"];