replace TableCapabilities

Nextcloud.xcodeproj/project.pbxproj

@@ -313,14 +313,6 @@
 		F76B3CCF1EAE01BD00921AC9 /* NCBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */; };
 		F76B3CD01EAE01BD00921AC9 /* NCBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */; };
 		F76B3CD11EAE01BD00921AC9 /* NCBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */; };
-		F76B3CE11EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CDE1EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m */; };
-		F76B3CE21EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CDE1EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m */; };
-		F76B3CE31EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CDE1EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m */; };
-		F76B3CE41EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CDE1EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m */; };
-		F76B3CE51EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CE01EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m */; };
-		F76B3CE61EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CE01EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m */; };
-		F76B3CE71EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CE01EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m */; };
-		F76B3CE81EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = F76B3CE01EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m */; };
 		F77B0DF01D118A16002130FE /* UIImage+Resizing.m in Sources */ = {isa = PBXBuildFile; fileRef = F70F04CA1C889184008DAB36 /* UIImage+Resizing.m */; };
 		F77B0DF21D118A16002130FE /* CCUploadFromOtherUpp.m in Sources */ = {isa = PBXBuildFile; fileRef = F7956FCA1B4886E60085DEA3 /* CCUploadFromOtherUpp.m */; };
 		F77B0DF41D118A16002130FE /* CCMain.m in Sources */ = {isa = PBXBuildFile; fileRef = F70211FB1BAC56E9003FC03E /* CCMain.m */; };
@@ -1379,10 +1371,6 @@
 		F769D3991E9E1506006DBBB4 /* CCLocalStorageCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CCLocalStorageCell.xib; sourceTree = "<group>"; };
 		F76B3CCD1EAE01BD00921AC9 /* NCBrand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NCBrand.swift; sourceTree = "<group>"; };
 		F76B3CDC1EAE4D9100921AC9 /* cryptocloud 8.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "cryptocloud 8.xcdatamodel"; sourceTree = "<group>"; };
-		F76B3CDD1EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TableCapabilities+CoreDataClass.h"; sourceTree = "<group>"; };
-		F76B3CDE1EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TableCapabilities+CoreDataClass.m"; sourceTree = "<group>"; };
-		F76B3CDF1EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TableCapabilities+CoreDataProperties.h"; sourceTree = "<group>"; };
-		F76B3CE01EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TableCapabilities+CoreDataProperties.m"; sourceTree = "<group>"; };
 		F76C3B831C6388BC00DC4301 /* CCGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGraphics.h; sourceTree = "<group>"; };
 		F76C3B841C6388BC00DC4301 /* CCGraphics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCGraphics.m; sourceTree = "<group>"; };
 		F76C3B871C638A4C00DC4301 /* CCError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCError.h; sourceTree = "<group>"; };
@@ -2838,10 +2826,6 @@
 		F77F86401B4ABF6D009F0A10 /* Table */ = {
 			isa = PBXGroup;
 			children = (
-				F76B3CDD1EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.h */,
-				F76B3CDE1EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m */,
-				F76B3CDF1EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.h */,
-				F76B3CE01EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m */,
 				F73C414C1E82E51F000137C0 /* TableExternalSites+CoreDataClass.h */,
 				F73C414D1E82E51F000137C0 /* TableExternalSites+CoreDataClass.m */,
 				F73C414E1E82E51F000137C0 /* TableExternalSites+CoreDataProperties.h */,
@@ -3958,7 +3942,6 @@
 				F71459BD1D12E3B700CAFEEC /* UIImage+animatedGIF.m in Sources */,
 				F708CF6E1E56E8CC00271D8B /* TableMetadata+CoreDataClass.m in Sources */,
 				F71459BE1D12E3B700CAFEEC /* UIImage+Reflection.m in Sources */,
-				F76B3CE61EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m in Sources */,
 				F73CC06D1E813DFF006E3047 /* BKPasscodeField.m in Sources */,
 				F71459BF1D12E3B700CAFEEC /* RNEncryptor.m in Sources */,
 				F708CF891E56E8CC00271D8B /* TableShare+CoreDataProperties.m in Sources */,
@@ -3973,7 +3956,6 @@
 				F71459C51D12E3B700CAFEEC /* UIImage+Rotating.m in Sources */,
 				F71459C61D12E3B700CAFEEC /* CCMetadata.m in Sources */,
 				F708CF771E56E8CC00271D8B /* TableLocalFile+CoreDataProperties.m in Sources */,
-				F76B3CE21EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */,
 				F71459C91D12E3B700CAFEEC /* OCNetworking.m in Sources */,
 				F71459CC1D12E3B700CAFEEC /* RNCryptorEngine.m in Sources */,
 				F71459CD1D12E3B700CAFEEC /* AFViewShaker.m in Sources */,
@@ -4033,7 +4015,6 @@
 				F74344801E127ED3001CC831 /* NSString+Base64.m in Sources */,
 				F708CF871E56E8CC00271D8B /* TableShare+CoreDataClass.m in Sources */,
 				F708CF9C1E56E8CC00271D8B /* TableAccount+CoreDataProperties.m in Sources */,
-				F76B3CE71EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m in Sources */,
 				F708CF811E56E8CC00271D8B /* TableDirectory+CoreDataClass.m in Sources */,
 				F708CF901E56E8CC00271D8B /* TableCertificates+CoreDataProperties.m in Sources */,
 				F743448C1E128010001CC831 /* CCCrypto.m in Sources */,
@@ -4080,7 +4061,6 @@
 				F708CF8A1E56E8CC00271D8B /* TableShare+CoreDataProperties.m in Sources */,
 				F74344661E127E35001CC831 /* CCCoreData.m in Sources */,
 				F76B3CD01EAE01BD00921AC9 /* NCBrand.swift in Sources */,
-				F76B3CE31EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */,
 				F73CC0801E813DFF006E3047 /* BKTouchIDSwitchView.m in Sources */,
 				F743447C1E127EB2001CC831 /* NSString+TruncateToWidth.m in Sources */,
 				F708CF751E56E8CC00271D8B /* TableLocalFile+CoreDataClass.m in Sources */,
@@ -4094,8 +4074,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				F74344251E1264EE001CC831 /* FileProvider.swift in Sources */,
-				F76B3CE41EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */,
-				F76B3CE81EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m in Sources */,
 				F76B3CD11EAE01BD00921AC9 /* NCBrand.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -4208,7 +4186,6 @@
 				F77B0E391D118A16002130FE /* CCContoCorrente.m in Sources */,
 				F77B0E3A1D118A16002130FE /* RNCryptorEngine.m in Sources */,
 				F77B0E3C1D118A16002130FE /* CCCartaIdentita.m in Sources */,
-				F76B3CE51EAE4E5100921AC9 /* TableCapabilities+CoreDataProperties.m in Sources */,
 				F762CB761EACB7D400B38484 /* ReaderThumbView.m in Sources */,
 				F7659A6C1DC0B760004860C4 /* PSTGridLayoutItem.m in Sources */,
 				F762CAFF1EACB66200B38484 /* XLFormPickerCell.m in Sources */,
@@ -4278,7 +4255,6 @@
 				F76B3CCE1EAE01BD00921AC9 /* NCBrand.swift in Sources */,
 				F7B1FBC91E72E3D1001781FE /* SwiftWebVCActivityChrome.swift in Sources */,
 				F7F06EA51DBFACC600099AE9 /* CTAssetItemViewController.m in Sources */,
-				F76B3CE11EAE4E5100921AC9 /* TableCapabilities+CoreDataClass.m in Sources */,
 				F762CB8A1EACB81000B38484 /* REMenuItemView.m in Sources */,
 				F7659A5A1DC0B760004860C4 /* PSTCollectionView.m in Sources */,
 				F7BF1B431D51E893000854F6 /* CCLogin.m in Sources */,

Picker/DocumentPickerViewController.swift

@@ -129,9 +129,9 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         hud = CCHud.init(view: self.navigationController?.view)
         
         // Theming
-        let tableCapabilities = CCCoreData.getCapabilitesForAccount(activeAccount)
+        let tableCapabilities = NCManageDatabase.sharedInstance.getCapabilitesForAccount(activeAccount!)
         if (tableCapabilities != nil && CCGraphics.isOptionUseThemingColor() == true) {
-            if ((tableCapabilities?.themingColor?.characters.count)! > 0) {
+            if ((tableCapabilities?.themingColor.characters.count)! > 0) {
                 NCBrandColor.sharedInstance.brand = CCGraphics.color(fromHexString: tableCapabilities?.themingColor)
             }
         }

Share Ext/ShareViewController.h

@@ -38,7 +38,6 @@
 #import "CCHud.h"
 
 #import "TableAccount+CoreDataClass.h"
-#import "TableCapabilities+CoreDataClass.h"
 
 @interface ShareViewController : UIViewController <UITableViewDelegate, OCNetworkingDelegate, MBProgressHUDDelegate, BKPasscodeViewControllerDelegate, CCNetworkingDelegate, CCMoveDelegate>
 

Share Ext/ShareViewController.m

@@ -173,9 +173,9 @@
     UIBarButtonItem *rightButtonUpload, *rightButtonEncrypt, *leftButtonCancel;
 
     // Theming
-    TableCapabilities *tableCapabilities = [CCCoreData getCapabilitesForAccount:self.activeAccount];
-    if (k_option_use_themingColor && tableCapabilities.themingColor.length > 0)
-        [NCBrandColor sharedInstance].brand = [CCGraphics colorFromHexString:tableCapabilities.themingColor];
+    tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesForAccount:self.activeAccount];
+    if (k_option_use_themingColor && capabilities.themingColor.length > 0)
+        [NCBrandColor sharedInstance].brand = [CCGraphics colorFromHexString:capabilities.themingColor];
 
     self.navigationController.navigationBar.barTintColor = [NCBrandColor sharedInstance].brand;
     self.navigationController.navigationBar.tintColor = [NCBrandColor sharedInstance].navigationBarText;

iOSClient/AppDelegate.m

@@ -988,11 +988,11 @@
 {
     if (self.activeAccount.length > 0) {
     
-        TableCapabilities *tableCapabilities = [CCCoreData getCapabilitesForAccount:self.activeAccount];
+        tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesForAccount:self.activeAccount];
     
-        if (k_option_use_themingColor && tableCapabilities.themingColor.length > 0) {
+        if (k_option_use_themingColor && capabilities.themingColor.length > 0) {
         
-            [NCBrandColor sharedInstance].brand = [CCGraphics colorFromHexString:tableCapabilities.themingColor];
+            [NCBrandColor sharedInstance].brand = [CCGraphics colorFromHexString:capabilities.themingColor];
             
         } else {
             

iOSClient/FileSystem/CCCoreData.h

@@ -43,7 +43,6 @@
 #import "TableShare+CoreDataClass.h"
 #import "TableAutomaticUpload+CoreDataClass.h"
 #import "TableExternalSites+CoreDataClass.h"
-#import "TableCapabilities+CoreDataClass.h"
 
 @interface CCCoreData : NSObject
 
@@ -210,12 +209,6 @@
 + (void)deleteAllExternalSitesForAccount:(NSString *)account;
 + (NSArray *)getAllTableExternalSitesWithPredicate:(NSPredicate *)predicate;
 
-// ===== Capabilities =====
-
-+ (void)setCapabilities:(OCCapabilities *)capabilities account:(NSString *)account;
-+ (TableCapabilities *)getCapabilitesForAccount:(NSString *)account;
-+ (NSInteger)getServerVersionAccount:(NSString *)activeAccount;
-
 // ===== File System =====
 
 + (BOOL)downloadFile:(CCMetadata *)metadata directoryUser:(NSString *)directoryUser activeAccount:(NSString *)activeAccount;
@@ -234,7 +227,6 @@
 
 + (void)flushTableAccount:(NSString *)account;
 + (void)flushTableAutomaticUploadAccount:(NSString *)account selector:(NSString *)selector;
-+ (void)flushTableCapabilitiesAccount:(NSString *)account;
 + (void)flushTableCertificates;
 + (void)flushTableDirectoryAccount:(NSString *)account;
 + (void)flushTableExternalSitesAccount:(NSString *)account;

iOSClient/FileSystem/CCCoreData.m

@@ -1883,58 +1883,6 @@
     return [records sortedArrayUsingDescriptors:[NSArray arrayWithObjects:descriptor, nil]];
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Capabilities =====
-#pragma --------------------------------------------------------------------------------------------
-
-+ (void)setCapabilities:(OCCapabilities *)capabilities account:(NSString *)account
-{
-    [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
-        
-        [TableCapabilities MR_deleteAllMatchingPredicate:[NSPredicate predicateWithFormat:@"(account == %@)", account] inContext:localContext];
-        
-        TableCapabilities *record = [TableCapabilities MR_createEntityInContext:localContext];
-        
-        record.account = account;
-        
-        record.themingBackground = capabilities.themingBackground;
-        record.themingColor = capabilities.themingColor;
-        record.themingLogo = capabilities.themingLogo;
-        record.themingName = capabilities.themingName;
-        record.themingSlogan = capabilities.themingSlogan;
-        record.themingUrl = capabilities.themingUrl;
-        
-        record.versionMajor = [NSNumber numberWithInteger:capabilities.versionMajor];
-        record.versionMinor = [NSNumber numberWithInteger:capabilities.versionMinor];
-        record.versionMicro = [NSNumber numberWithInteger:capabilities.versionMicro];
-        record.versionString = capabilities.versionString;
-    }];
-}
-
-+ (TableCapabilities *)getCapabilitesForAccount:(NSString *)account
-{
-    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
-    
-    return [TableCapabilities MR_findFirstWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@)", account] inContext:context];
-}
-
-+ (NSInteger)getServerVersionAccount:(NSString *)activeAccount
-{
-    if (!activeAccount)
-        return 0;
-    
-    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
-    TableCapabilities *record = [TableCapabilities MR_findFirstWithPredicate:predicate];
-    
-    if (record) {
-        
-        NSInteger versionMajor = [record.versionMajor integerValue];
-        return versionMajor;
-        
-    } else
-        return 0;
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== File System =====
 #pragma --------------------------------------------------------------------------------------------
@@ -2221,22 +2169,6 @@
     [context MR_saveToPersistentStoreAndWait];
 }
 
-+ (void)flushTableCapabilitiesAccount:(NSString *)account
-{
-    NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
-    
-    if (account) {
-        
-        [TableCapabilities MR_deleteAllMatchingPredicate:[NSPredicate predicateWithFormat:@"(account == %@)", account] inContext:context];
-        
-    } else {
-        
-        [TableCapabilities MR_truncateAllInContext:context];
-    }
-    
-    [context MR_saveToPersistentStoreAndWait];
-}
-
 + (void)flushTableCertificates
 {
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
@@ -2332,12 +2264,9 @@
     NSManagedObjectContext *context = [NSManagedObjectContext MR_defaultContext];
     
     [TableAccount MR_truncateAllInContext:context];
-    //[TableActivity MR_truncateAllInContext:context];
     [TableAutomaticUpload MR_truncateAllInContext:context];
-    [TableCapabilities MR_truncateAllInContext:context];
     [TableCertificates MR_truncateAllInContext:context];
     [TableDirectory MR_truncateAllInContext:context];
-    //[TableGPS MR_truncateAllInContext:context];
     [TableLocalFile MR_truncateAllInContext:context];
     [TableMetadata MR_truncateAllInContext:context];
     [TableShare MR_truncateAllInContext:context];

iOSClient/FileSystem/NCDatabase.swift

@@ -23,6 +23,22 @@ class tableActivity: Object {
     dynamic var verbose : Bool = false
 }
 
+class tableCapabilities: Object {
+    
+    dynamic var account = ""
+    dynamic var themingBackground = ""
+    dynamic var themingColor = ""
+    dynamic var themingLogo = ""
+    dynamic var themingName = ""
+    dynamic var themingSlogan = ""
+    dynamic var themingUrl = ""
+    dynamic var versionMajor : Int = 0
+    dynamic var versionMicro : Int = 0
+    dynamic var versionMinor : Int = 0
+    dynamic var versionString = ""
+
+}
+
 class tableGPS: Object {
     
     dynamic var latitude = ""

iOSClient/FileSystem/NCManageDatabase.swift

@@ -138,6 +138,67 @@ class NCManageDatabase: NSObject {
         return Array(results)
     }
     
+    //MARK: -
+    //MARK: Table Capabilities
+    
+    func addCapabilities(_ capabilities: OCCapabilities, account: String) {
+        
+        let realm = try! Realm()
+        
+        let results = realm.objects(tableCapabilities.self).filter("account = '\(account)'")
+        
+        try! realm.write {
+            
+            var resultCapabilities = tableCapabilities()
+            
+            if (results.count > 0) {
+                resultCapabilities = results[0]
+            }
+            
+            resultCapabilities.account = account
+            resultCapabilities.themingBackground = capabilities.themingBackground
+            resultCapabilities.themingColor = capabilities.themingColor
+            resultCapabilities.themingLogo = capabilities.themingLogo
+            resultCapabilities.themingName = capabilities.themingName
+            resultCapabilities.themingSlogan = capabilities.themingSlogan
+            resultCapabilities.themingUrl = capabilities.themingUrl
+            resultCapabilities.versionMajor = capabilities.versionMajor
+            resultCapabilities.versionMinor = capabilities.versionMinor
+            resultCapabilities.versionMicro = capabilities.versionMicro
+            resultCapabilities.versionString = capabilities.versionString
+            
+            if (results.count == 0) {
+                realm.add(resultCapabilities)
+            }
+        }
+    }
+    
+    func getCapabilitesForAccount(_ account: String) -> tableCapabilities? {
+        
+        let realm = try! Realm()
+        
+        let results = realm.objects(tableCapabilities.self).filter("account = '\(account)'")
+        
+        if (results.count > 0) {
+            return results[0]
+        } else {
+            return nil
+        }
+    }
+    
+    func getServerVersionAccount(_ account: String) -> Int {
+
+        let realm = try! Realm()
+
+        let results = realm.objects(tableCapabilities.self).filter("account = '\(account)'")
+
+        if (results.count > 0) {
+            return results[0].versionMajor
+        } else {
+            return 0
+        }
+    }
+
     //MARK: -
     //MARK: Table GPS
     

iOSClient/FileSystem/TableCapabilities+CoreDataClass.h

@@ -1,20 +0,0 @@
-//
-//  TableCapabilities+CoreDataClass.h
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 24/04/17.
-//  Copyright © 2017 TWS. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface TableCapabilities : NSManagedObject
-
-@end
-
-NS_ASSUME_NONNULL_END
-
-#import "TableCapabilities+CoreDataProperties.h"

iOSClient/FileSystem/TableCapabilities+CoreDataClass.m

@@ -1,13 +0,0 @@
-//
-//  TableCapabilities+CoreDataClass.m
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 24/04/17.
-//  Copyright © 2017 TWS. All rights reserved.
-//
-
-#import "TableCapabilities+CoreDataClass.h"
-
-@implementation TableCapabilities
-
-@end

iOSClient/FileSystem/TableCapabilities+CoreDataProperties.h

@@ -1,32 +0,0 @@
-//
-//  TableCapabilities+CoreDataProperties.h
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 24/04/17.
-//  Copyright © 2017 TWS. All rights reserved.
-//
-
-#import "TableCapabilities+CoreDataClass.h"
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface TableCapabilities (CoreDataProperties)
-
-+ (NSFetchRequest<TableCapabilities *> *)fetchRequest;
-
-@property (nullable, nonatomic, copy) NSString *account;
-@property (nullable, nonatomic, copy) NSString *themingBackground;
-@property (nullable, nonatomic, copy) NSString *themingColor;
-@property (nullable, nonatomic, copy) NSString *themingLogo;
-@property (nullable, nonatomic, copy) NSString *themingName;
-@property (nullable, nonatomic, copy) NSString *themingSlogan;
-@property (nullable, nonatomic, copy) NSString *themingUrl;
-@property (nullable, nonatomic, copy) NSNumber *versionMajor;
-@property (nullable, nonatomic, copy) NSNumber *versionMicro;
-@property (nullable, nonatomic, copy) NSNumber *versionMinor;
-@property (nullable, nonatomic, copy) NSString *versionString;
-
-@end
-
-NS_ASSUME_NONNULL_END

iOSClient/FileSystem/TableCapabilities+CoreDataProperties.m

@@ -1,29 +0,0 @@
-//
-//  TableCapabilities+CoreDataProperties.m
-//  Nextcloud
-//
-//  Created by Marino Faggiana on 24/04/17.
-//  Copyright © 2017 TWS. All rights reserved.
-//
-
-#import "TableCapabilities+CoreDataProperties.h"
-
-@implementation TableCapabilities (CoreDataProperties)
-
-+ (NSFetchRequest<TableCapabilities *> *)fetchRequest {
-	return [[NSFetchRequest alloc] initWithEntityName:@"TableCapabilities"];
-}
-
-@dynamic account;
-@dynamic themingBackground;
-@dynamic themingColor;
-@dynamic themingLogo;
-@dynamic themingName;
-@dynamic themingSlogan;
-@dynamic themingUrl;
-@dynamic versionMajor;
-@dynamic versionMinor;
-@dynamic versionMicro;
-@dynamic versionString;
-
-@end

iOSClient/Main/CCMain.m

@@ -201,8 +201,8 @@
     [self.searchController.searchBar sizeToFit];
     self.searchController.searchBar.delegate = self;
     self.searchController.searchBar.placeholder = NSLocalizedString(@"_search_this_folder_",nil);
-
-    if ([CCCoreData getServerVersionAccount:app.activeAccount] >= 12) {
+    
+    if ([[NCManageDatabase sharedInstance] getServerVersionAccount:app.activeAccount] >= 12) {
         
         if (_isRoot)
             self.searchController.searchBar.scopeButtonTitles = [NSArray arrayWithObjects:NSLocalizedString(@"_search_this_folder_",nil),NSLocalizedString(@"_search_all_folders_",nil), nil];
@@ -1217,7 +1217,7 @@
 - (void)getCapabilitiesOfServerSuccess:(OCCapabilities *)capabilities
 {
     // Update capabilities db
-    [CCCoreData setCapabilities:capabilities account:app.activeAccount];
+    [[NCManageDatabase sharedInstance] addCapabilities:capabilities account:app.activeAccount];
     
     // ------ THEMING -----------------------------------------------------------------------
     
@@ -1241,7 +1241,7 @@
     // ------ SEARCH  ------------------------------------------------------------------------
     
     // Search bar if change version
-    if ([CCCoreData getServerVersionAccount:app.activeAccount] != capabilities.versionMajor) {
+    if ([[NCManageDatabase sharedInstance] getServerVersionAccount:app.activeAccount] != capabilities.versionMajor) {
     
         [self cancelSearchBar];
         
@@ -1997,7 +1997,7 @@
         
         _searchFileName = fileName;
         
-        if ([CCCoreData getServerVersionAccount:app.activeAccount] >= 12 && ![_depth isEqualToString:@"0"]) {
+        if ([[NCManageDatabase sharedInstance] getServerVersionAccount:app.activeAccount] >= 12 && ![_depth isEqualToString:@"0"]) {
             
             [[CCActions sharedInstance] search:_serverUrl fileName:_searchFileName depth:_depth delegate:self];
             

iOSClient/Settings/CCAdvanced.m

@@ -320,7 +320,9 @@
             [[NCManageDatabase sharedInstance] clearTable:[tableActivity class] account:app.activeAccount];
 
             [CCCoreData flushTableAutomaticUploadAccount:app.activeAccount selector:nil];
-            [CCCoreData flushTableCapabilitiesAccount:app.activeAccount];
+            
+            [[NCManageDatabase sharedInstance] clearTable:[tableCapabilities class] account:app.activeAccount];
+            
             [CCCoreData flushTableDirectoryAccount:app.activeAccount];
             [CCCoreData flushTableExternalSitesAccount:app.activeAccount];
                         

iOSClient/Settings/CCManageAccount.m

@@ -327,7 +327,7 @@
     [[NCManageDatabase sharedInstance] clearTable:[tableActivity class] account:account];
     
     [CCCoreData flushTableAutomaticUploadAccount:account selector:nil];
-    [CCCoreData flushTableCapabilitiesAccount:account];
+    [[NCManageDatabase sharedInstance] clearTable:[tableCapabilities class] account:app.activeAccount];
     [CCCoreData flushTableDirectoryAccount:account];
     [CCCoreData flushTableExternalSitesAccount:account];
     [CCCoreData flushTableLocalFileAccount:account];

iOSClient/Settings/CCSettings.m

@@ -438,9 +438,9 @@
         break;
         case 5: {
             
-            TableCapabilities *record = [CCCoreData getCapabilitesForAccount:app.activeAccount];
+            tableCapabilities *capabilities = [[NCManageDatabase sharedInstance] getCapabilitesForAccount:app.activeAccount];
             
-            NSString *versionServer = record.versionString;
+            NSString *versionServer = capabilities.versionString;
             
             NSString *versionApp = [NSString stringWithFormat:@"%@.%@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"], [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
             

iOSClient/cryptocloud.xcdatamodeld/cryptocloud 9.xcdatamodel/contents

@@ -47,19 +47,6 @@
         <attribute name="serverUrl" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="session" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
-    <entity name="TableCapabilities" representedClassName="TableCapabilities" syncable="YES">
-        <attribute name="account" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="themingBackground" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="themingColor" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="themingLogo" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="themingName" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="themingSlogan" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="themingUrl" optional="YES" attributeType="String" syncable="YES"/>
-        <attribute name="versionMajor" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="versionMicro" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="versionMinor" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="versionString" optional="YES" attributeType="String" syncable="YES"/>
-    </entity>
     <entity name="TableCertificates" representedClassName="TableCertificates" syncable="YES">
         <attribute name="certificateLocation" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
@@ -142,7 +129,6 @@
     <elements>
         <element name="TableAccount" positionX="-6597" positionY="111" width="171" height="540"/>
         <element name="TableAutomaticUpload" positionX="-6597" positionY="801" width="128" height="195"/>
-        <element name="TableCapabilities" positionX="-6390" positionY="261" width="128" height="210"/>
         <element name="TableCertificates" positionX="-6597" positionY="711" width="128" height="60"/>
         <element name="TableDirectory" positionX="-6372" positionY="111" width="162" height="210"/>
         <element name="TableExternalSites" positionX="-6399" positionY="252" width="128" height="150"/>