Browse Source

update capabilities

marinofaggiana 6 years ago
parent
commit
15db44eb28

+ 1 - 1
iOSClient/CCGlobal.h

@@ -82,7 +82,7 @@
 
 
 // Database Realm
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         49
+#define k_databaseSchemaVersion                         50
 
 
 // Intro selector
 // Intro selector
 #define k_intro_login                                   0
 #define k_intro_login                                   0

+ 5 - 0
iOSClient/Database/NCDatabase.swift

@@ -185,6 +185,11 @@ class tableCapabilities: Object {
     @objc dynamic var isFileSharingShareByMailEnabled: Bool = false
     @objc dynamic var isFileSharingShareByMailEnabled: Bool = false
     @objc dynamic var isFileSharingShareByMailPassword: Bool = false
     @objc dynamic var isFileSharingShareByMailPassword: Bool = false
     @objc dynamic var isFileSharingShareByMailUploadFilesDrop: Bool = false
     @objc dynamic var isFileSharingShareByMailUploadFilesDrop: Bool = false
+    // HC
+    @objc dynamic var isHandwerkcloudEnabled: Bool = false
+    @objc dynamic var HCShopUrl = ""
+    // Imagemeter
+    @objc dynamic var isImagemeterEnabled: Bool = false
 }
 }
 
 
 class tableCertificates: Object {
 class tableCertificates: Object {

+ 5 - 2
iOSClient/Database/NCManageDatabase.swift

@@ -810,12 +810,15 @@ class NCManageDatabase: NSObject {
                 resultCapabilities.isFileSharingShareByMailEnabled = capabilities.isFileSharingShareByMailEnabled
                 resultCapabilities.isFileSharingShareByMailEnabled = capabilities.isFileSharingShareByMailEnabled
                 resultCapabilities.isFileSharingShareByMailPassword = capabilities.isFileSharingShareByMailPassword
                 resultCapabilities.isFileSharingShareByMailPassword = capabilities.isFileSharingShareByMailPassword
                 resultCapabilities.isFileSharingShareByMailUploadFilesDrop = capabilities.isFileSharingShareByMailUploadFilesDrop
                 resultCapabilities.isFileSharingShareByMailUploadFilesDrop = capabilities.isFileSharingShareByMailUploadFilesDrop
+                // HC
+                resultCapabilities.isHandwerkcloudEnabled = capabilities.isHandwerkcloudEnabled
+                resultCapabilities.HCShopUrl = capabilities.hcShopUrl
+                // Imagemeter
+                resultCapabilities.isImagemeterEnabled = capabilities.isImagemeterEnabled
                 
                 
                 if result == nil {
                 if result == nil {
                     realm.add(resultCapabilities)
                     realm.add(resultCapabilities)
                 }
                 }
-                
-                
             }
             }
         } catch let error {
         } catch let error {
             print("[LOG] Could not write to database: ", error)
             print("[LOG] Could not write to database: ", error)

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

@@ -108,4 +108,11 @@
 @property (nonatomic) BOOL isActivityV2Enabled;
 @property (nonatomic) BOOL isActivityV2Enabled;
 @property (nonatomic, strong) NSString *activityV2;
 @property (nonatomic, strong) NSString *activityV2;
 
 
+// HC
+@property (nonatomic) BOOL isHandwerkcloudEnabled;
+@property (nonatomic, strong) NSString *HCShopUrl;
+
+// Imagemeter
+@property (nonatomic) BOOL isImagemeterEnabled;
+
 @end
 @end

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

@@ -39,6 +39,8 @@
         self.spreedFeatures = @"";
         self.spreedFeatures = @"";
         
         
         self.richdocumentsMimetypes = [NSArray new];
         self.richdocumentsMimetypes = [NSArray new];
+        
+        self.HCShopUrl = @"";
     }
     }
     return self;
     return self;
 }
 }

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

@@ -1559,6 +1559,25 @@
                     capabilities.richdocumentsDirectEditing = [[richdocuments valueForKey:@"direct_editing"] boolValue];
                     capabilities.richdocumentsDirectEditing = [[richdocuments valueForKey:@"direct_editing"] boolValue];
                     capabilities.richdocumentsMimetypes = [richdocuments valueForKey:@"mimetypes"];
                     capabilities.richdocumentsMimetypes = [richdocuments valueForKey:@"mimetypes"];
                 }
                 }
+                
+                //Handwerkcloud
+                
+                NSDictionary *handwerkcloudDic = [capabilitiesDict valueForKey:@"handwerkcloud"];
+                if (handwerkcloudDic) {
+                    NSNumber *isHandwerkcloudEnabledNumber = (NSNumber*)[handwerkcloudDic valueForKey:@"enabled"];
+                    capabilities.isHandwerkcloudEnabled = isHandwerkcloudEnabledNumber.boolValue;
+                    
+                    if ([handwerkcloudDic valueForKey:@"shop_url"] && ![[handwerkcloudDic valueForKey:@"shop_url"] isEqual:[NSNull null]])
+                        capabilities.HCShopUrl = [handwerkcloudDic valueForKey:@"shop_url"];
+                }
+                
+                //Imagemeter
+                
+                NSDictionary *imagemeterDic = [capabilitiesDict valueForKey:@"imagemeter"];
+                if (imagemeterDic) {
+                    NSNumber *isImagemeterEnabledNumber = (NSNumber*)[imagemeterDic valueForKey:@"enabled"];
+                    capabilities.isImagemeterEnabled = isImagemeterEnabledNumber.boolValue;
+                }
             }
             }
         
         
             successRequest(response, capabilities, request.redirectedServer);
             successRequest(response, capabilities, request.redirectedServer);