Improvements code

iOSClient/AutoUpload/NCAutoUpload.m

@@ -87,7 +87,7 @@
         tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
 
         if (account.autoUpload == YES)
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUpload" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUpload" state:NO];
         
         [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
         
@@ -107,7 +107,7 @@
         tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
 
         if (account.autoUpload == YES)
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUpload" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUpload" state:NO];
         
         [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
         
@@ -142,7 +142,7 @@
                 if ([ALAssetsLibrary authorizationStatus] == ALAuthorizationStatusAuthorized) {
                     
                     if (account.autoUploadBackground == YES)
-                        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:NO];
+                        [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:NO];
                     
                     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_location_not_enabled_", nil) message:NSLocalizedString(@"_location_not_enabled_msg_", nil) delegate:nil cancelButtonTitle:NSLocalizedString(@"_ok_", nil) otherButtonTitles:nil];
                     [alert show];
@@ -159,14 +159,14 @@
             if ([ALAssetsLibrary authorizationStatus] == ALAuthorizationStatusAuthorized) {
                 
                 if (account.autoUploadBackground == NO)
-                    [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:YES];
+                    [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:YES];
                 
                 [[CCManageLocation sharedInstance] startSignificantChangeUpdates];
                 
             } else {
                 
                 if (account.autoUploadBackground == YES)
-                    [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:NO];
+                    [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:NO];
                 
                 [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
                 
@@ -178,7 +178,7 @@
     } else {
         
         if (account.autoUploadBackground == YES)
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:NO];
         
         [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
         
@@ -223,7 +223,7 @@
                 if ([CCManageLocation sharedInstance].firstChangeAuthorizationDone) {
                     
                     if (account.autoUploadBackground == YES)
-                        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:NO];
+                        [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:NO];
                     
                     [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
                 }
@@ -238,7 +238,7 @@
             
             if (account.autoUploadBackground == YES) {
                 
-                [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:NO];
+                [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:NO];
                 
                 [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
                 
@@ -280,10 +280,10 @@
         } else {
             
             if (account.autoUpload == YES)
-                [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUpload" state:NO];
+                [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUpload" state:NO];
             
             if (account.autoUploadBackground == YES)
-                [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:NO];
+                [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:NO];
             
             [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
         }

iOSClient/Database/NCManageDatabase.swift

@@ -302,7 +302,7 @@ class NCManageDatabase: NSObject {
         return activeAccount
     }
 
-    func setAccountAutoUploadFiled(_ field: String, state: Bool) {
+    func setAccountAutoUploadProperty(_ property: String, state: Bool) {
         
         let realm = try! Realm()
         
@@ -313,31 +313,36 @@ class NCManageDatabase: NSObject {
             return
         }
         
-        switch field {
-        case "autoUpload":
-            result.autoUpload = state
-        case "autoUploadBackground":
-            result.autoUploadBackground = state
-        case "autoUploadCreateSubfolder":
-            result.autoUploadCreateSubfolder = state
-        case "autoUploadFull":
-            result.autoUploadFull = state
-        case "autoUploadImage":
-            result.autoUploadImage = state
-        case "autoUploadVideo":
-            result.autoUploadVideo = state
-        case "autoUploadWWAnPhoto":
-            result.autoUploadWWAnPhoto = state
-        case "autoUploadWWAnVideo":
-            result.autoUploadWWAnVideo = state
-        default:
-            print("No founfd field")
-        }
+        if (tableAccount().objectSchema.properties.contains { $0.name == property }) {
+            
+            switch property {
+            case "autoUpload":
+                result.autoUpload = state
+            case "autoUploadBackground":
+                result.autoUploadBackground = state
+            case "autoUploadCreateSubfolder":
+                result.autoUploadCreateSubfolder = state
+            case "autoUploadFull":
+                result.autoUploadFull = state
+            case "autoUploadImage":
+                result.autoUploadImage = state
+            case "autoUploadVideo":
+                result.autoUploadVideo = state
+            case "autoUploadWWAnPhoto":
+                result.autoUploadWWAnPhoto = state
+            case "autoUploadWWAnVideo":
+                result.autoUploadWWAnVideo = state
+            default:
+                print("property not found")
+            }
         
-        do {
-            try realm.commitWrite()
-        } catch let error {
-            print("[LOG] Could not write to database: ", error)
+            do {
+                try realm.commitWrite()
+            } catch let error {
+                print("[LOG] Could not write to database: ", error)
+            }
+        } else {
+            print("property not found")
         }
     }
     

iOSClient/Settings/CCManageAutoUpload.m

@@ -206,7 +206,7 @@
         
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
                         
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUpload" state:YES];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUpload" state:YES];
             
             // Default
             [[NCManageDatabase sharedInstance] setAccountAutoUploadFileName:nil];
@@ -214,16 +214,16 @@
             
             // verifichiamo che almeno uno dei servizi (foto video) siano attivi, in caso contrario attiviamo le foto
             if (account.autoUploadImage == NO && account.autoUploadVideo == NO) {
-                [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadImage" state:YES];
-                [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadVideo" state:YES];
+                [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadImage" state:YES];
+                [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadVideo" state:YES];
             }
             
             [[NCAutoUpload sharedInstance] alignPhotoLibrary];
             
         } else {
             
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUpload" state:NO];
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadFull" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUpload" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadFull" state:NO];
 
             // remove
             [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:app.activeAccount];
@@ -245,7 +245,7 @@
                 UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_autoupload_background_title_", nil) message:NSLocalizedString(@"_autoupload_background_msg_", nil) delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"_ok_", nil), nil];
                 [alertView show];
                     
-                [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:YES];
+                [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:YES];
                     
             } else {
                  
@@ -254,7 +254,7 @@
             
         } else {
             
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadBackground" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadBackground" state:NO];
             [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
         }
     }
@@ -264,7 +264,7 @@
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
             
             [[NCAutoUpload sharedInstance] setupAutoUploadFull];
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadFull" state:YES];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadFull" state:YES];
             
         } else {
             
@@ -275,13 +275,13 @@
             
             [[CCNetworking sharedNetworking] settingSessionsDownload:NO upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
             
-            [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadFull" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadFull" state:NO];
         }
     }
 
     if ([rowDescriptor.tag isEqualToString:@"autoUploadImage"]) {
         
-        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadImage" state:[[rowDescriptor.value valueData] boolValue]];
+        [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadImage" state:[[rowDescriptor.value valueData] boolValue]];
 
         if ([[rowDescriptor.value valueData] boolValue] == YES)
             [[NCAutoUpload sharedInstance] alignPhotoLibrary];
@@ -289,12 +289,12 @@
     
     if ([rowDescriptor.tag isEqualToString:@"autoUploadWWAnPhoto"]) {
         
-        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadWWAnPhoto" state:[[rowDescriptor.value valueData] boolValue]];
+        [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadWWAnPhoto" state:[[rowDescriptor.value valueData] boolValue]];
     }
     
     if ([rowDescriptor.tag isEqualToString:@"autoUploadVideo"]) {
     
-        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadVideo" state:[[rowDescriptor.value valueData] boolValue]];
+        [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadVideo" state:[[rowDescriptor.value valueData] boolValue]];
 
         if ([[rowDescriptor.value valueData] boolValue] == YES)
             [[NCAutoUpload sharedInstance] alignPhotoLibrary];            
@@ -302,12 +302,12 @@
     
     if ([rowDescriptor.tag isEqualToString:@"autoUploadWWAnVideo"]) {
         
-        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadWWAnVideo" state:[[rowDescriptor.value valueData] boolValue]];
+        [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadWWAnVideo" state:[[rowDescriptor.value valueData] boolValue]];
     }
     
     if ([rowDescriptor.tag isEqualToString:@"autoUploadCreateSubfolder"]) {
         
-        [[NCManageDatabase sharedInstance] setAccountAutoUploadFiled:@"autoUploadCreateSubfolder" state:[[rowDescriptor.value valueData] boolValue]];
+        [[NCManageDatabase sharedInstance] setAccountAutoUploadProperty:@"autoUploadCreateSubfolder" state:[[rowDescriptor.value valueData] boolValue]];
     }
 }