浏览代码

capabilities

marinofaggiana 5 年之前
父节点
当前提交
518869bba7

+ 1 - 1
iOSClient/CCGlobal.h

@@ -84,7 +84,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         90
+#define k_databaseSchemaVersion                         91
 
 // Intro selector
 #define k_intro_login                                   0

+ 3 - 0
iOSClient/Database/NCDatabase.swift

@@ -200,6 +200,9 @@ class tableCapabilities: Object {
     // Pagination iOS Helper
     @objc dynamic var isPaginationEnabled: Bool = false
     @objc dynamic var paginationEndponit = ""
+    // Core
+    @objc dynamic var corePollInterval: Int = 0
+    @objc dynamic var coreWebDavRoot = ""
 }
 
 class tableComments: Object {

+ 9 - 1
iOSClient/Database/NCManageDatabase.swift

@@ -122,6 +122,11 @@ class NCManageDatabase: NSObject {
                         migration.deleteData(forType: tableTrash.className())
                     }
                     
+                    if oldSchemaVersion < 91 {
+                        migration.deleteData(forType: tableDirectory.className())
+                        migration.deleteData(forType: tableMetadata.className())
+                    }
+                    
                 }, shouldCompactOnLaunch: { totalBytes, usedBytes in
                     
                     // totalBytes refers to the size of the file on disk in bytes (data + free space)
@@ -951,7 +956,10 @@ class NCManageDatabase: NSObject {
                 // Pagination iOS Helper
                 resultCapabilities.isPaginationEnabled = capabilities.isPaginationEnabled
                 resultCapabilities.paginationEndponit = capabilities.paginationEndponit
-
+                // Core
+                resultCapabilities.corePollInterval = capabilities.corePollInterval
+                resultCapabilities.coreWebDavRoot = capabilities.coreWebDavRoot
+                
                 if result == nil {
                     realm.add(resultCapabilities)
                 }

+ 1 - 0
iOSClient/Library/OCCommunicationLib/OCCapabilities.h

@@ -21,6 +21,7 @@
 
 /*CORE*/
 @property (nonatomic) NSInteger corePollInterval;
+@property (nonatomic, strong) NSString *coreWebDavRoot;
 
 /*FILES SHARING*/
 

+ 2 - 0
iOSClient/Library/OCCommunicationLib/OCCapabilities.m

@@ -43,6 +43,8 @@
         self.HCShopUrl = @"";
         
         self.paginationEndponit = @"";
+        
+        self.coreWebDavRoot = @"remote.php/webdav";
     }
     return self;
 }

+ 6 - 4
iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -1276,16 +1276,18 @@
                 capabilities.versionEdition = (NSString*)[version valueForKey:@"edition"];
             
                 NSDictionary *capabilitiesDict = [data valueForKey:@"capabilities"];
-                NSDictionary *core = [capabilitiesDict valueForKey:@"core"];
-            
+                
                 //CORE
             
+                NSDictionary *core = [capabilitiesDict valueForKey:@"core"];
+                
                 NSNumber *corePollIntervalNumber = (NSNumber*)[core valueForKey:@"pollinterval"];
                 capabilities.corePollInterval = corePollIntervalNumber.integerValue;
-            
-                NSDictionary *fileSharing = [capabilitiesDict valueForKey:@"files_sharing"];
+                capabilities.coreWebDavRoot = [core valueForKey:@"webdav-root"];
             
                 //FILE SHARING
+                
+                NSDictionary *fileSharing = [capabilitiesDict valueForKey:@"files_sharing"];
             
                 NSNumber *fileSharingAPIEnabled = (NSNumber*)[fileSharing valueForKey:@"api_enabled"];
                 NSNumber *filesSharingDefaultPermissions = (NSNumber*)[fileSharing valueForKey:@"default_permissions"];