Browse Source

add capabilities iosHelper

marinofaggiana 5 years ago
parent
commit
4f756485ec

+ 5 - 4
File Provider Extension/FileProviderEnumerator.swift

@@ -28,6 +28,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
     
     var enumeratedItemIdentifier: NSFileProviderItemIdentifier
     var serverUrl: String?
+    let capabilities = NCManageDatabase.sharedInstance.getCapabilites(account: fileProviderData.sharedInstance.account)
     
     init(enumeratedItemIdentifier: NSFileProviderItemIdentifier) {
         
@@ -102,8 +103,8 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             
             if (page == NSFileProviderPage.initialPageSortedByDate as NSFileProviderPage || page == NSFileProviderPage.initialPageSortedByName as NSFileProviderPage) {
                 
-                if NCBrandBeta.shared.iOSHelper {
-                    
+                if capabilities?.isPaginationEnabled ?? false {
+                                    
                     // Beta
                     self.readFolder(serverUrl: serverUrl, page: 1, limit: fileProviderData.sharedInstance.itemForPage) { (metadatas) in
                         self.completeObserver(observer, numPage: 1, metadatas: metadatas)
@@ -125,8 +126,8 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
                 
                 let numPage = Int(String(data: page.rawValue, encoding: .utf8)!)!
 
-                if NCBrandBeta.shared.iOSHelper {
-                         
+                if capabilities?.isPaginationEnabled ?? false {
+
                     // Beta
                     self.readFolder(serverUrl: serverUrl, page: 1, limit: fileProviderData.sharedInstance.itemForPage) { (metadatas) in
                         self.completeObserver(observer, numPage: 1, metadatas: metadatas)

+ 1 - 1
iOSClient/Brand/NCBrand.swift

@@ -165,6 +165,6 @@ class NCBrandColor: NSObject {
         return instance
     }()
 
-    @objc public let iOSHelper: Bool = false
+    //@objc public let iOSHelper: Bool = false
 }
 

+ 1 - 1
iOSClient/CCGlobal.h

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

+ 3 - 0
iOSClient/Database/NCDatabase.swift

@@ -197,6 +197,9 @@ class tableCapabilities: Object {
     @objc dynamic var isFulltextsearchEnabled: Bool = false
     // Extended Support
     @objc dynamic var isExtendedSupportEnabled: Bool = false
+    // Pagination iOS Helper
+    @objc dynamic var isPaginationEnabled: Bool = false
+    @objc dynamic var paginationEndponit = ""
 }
 
 class tableComments: Object {

+ 4 - 1
iOSClient/Database/NCManageDatabase.swift

@@ -948,7 +948,10 @@ class NCManageDatabase: NSObject {
                 resultCapabilities.isFulltextsearchEnabled = capabilities.isFulltextsearchEnabled
                 // Extended Support
                 resultCapabilities.isExtendedSupportEnabled = capabilities.isExtendedSupportEnabled
-                
+                // Pagination iOS Helper
+                resultCapabilities.isPaginationEnabled = capabilities.isPaginationEnabled
+                resultCapabilities.paginationEndponit = capabilities.paginationEndponit
+
                 if result == nil {
                     realm.add(resultCapabilities)
                 }

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

@@ -121,4 +121,8 @@
 // Extended Support
 @property (nonatomic) BOOL isExtendedSupportEnabled;
 
+// Pagination
+@property (nonatomic) BOOL isPaginationEnabled;
+@property (nonatomic, strong) NSString *paginationEndponit;
+
 @end

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

@@ -41,10 +41,10 @@
         self.richdocumentsMimetypes = [NSArray new];
         
         self.HCShopUrl = @"";
+        
+        self.paginationEndponit = @"";
     }
     return self;
 }
 
-
-
 @end

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

@@ -1448,6 +1448,12 @@
                 capabilities.isFileUndeleteEnabled = fileUndeleteEnabledNumber.boolValue;
                 capabilities.isFileVersioningEnabled = fileVersioningEnabledNumber.boolValue;
             
+                NSDictionary *pagination = [files valueForKey:@"pagination"];
+                if (pagination) {
+                    capabilities.isPaginationEnabled = true;
+                    capabilities.paginationEndponit = [pagination valueForKey:@"endpoint"];
+                }
+                
                 //THEMING
             
                 NSDictionary *theming = [capabilitiesDict valueForKey:@"theming"];