Browse Source

fix Capabilities

Marino Faggiana 7 years ago
parent
commit
0ec82578b6

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

@@ -51,12 +51,17 @@
 
 // External sites
 @property (nonatomic) BOOL isExternalSitesServerEnabled;
+@property (nonatomic, strong) NSString *externalSiteV1;
 
 // Notification
 @property (nonatomic) BOOL isNotificationServerEnabled;
 @property (nonatomic, strong) NSString *notificationOcsEndpoints;
 @property (nonatomic, strong) NSString *notificationPush;
 
+// Spreed
+@property (nonatomic) BOOL isSpreedServerEnabled;
+@property (nonatomic, strong) NSString *spreedFeatures;
+
 /*FILES*/
 @property (nonatomic) BOOL isFileBigFileChunkingEnabled;
 @property (nonatomic) BOOL isFileUndeleteEnabled;

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

@@ -30,7 +30,14 @@
         self.themingSlogan = @"";
         self.themingUrl = @"";
         
+        self.externalSiteV1 = @"";
+        
         self.endToEndEncryptionVersion = @"";
+        
+        self.notificationOcsEndpoints = @"";
+        self.notificationPush = @"";
+        
+        self.spreedFeatures = @"";
     }
     return self;
 }

+ 13 - 3
iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -1385,13 +1385,13 @@
             
                 NSDictionary *externalSitesDic = [capabilitiesDict valueForKey:@"external"];
                 if (externalSitesDic) {
+                    capabilities.isExternalSitesServerEnabled = YES;
                     NSArray *externalSitesArray = [externalSitesDic valueForKey:@"v1"];
-                    if (externalSitesArray)
-                        if ([[externalSitesArray objectAtIndex:0] isEqualToString:@"sites"])
-                            capabilities.isExternalSitesServerEnabled = YES;
+                    capabilities.externalSiteV1 = [externalSitesArray componentsJoinedByString:@","];
                 }
                 
                 // NOTIFICATION
+                
                 NSDictionary *notificationDic = [capabilitiesDict valueForKey:@"notifications"];
                 if (notificationDic) {
                     capabilities.isNotificationServerEnabled = YES;
@@ -1400,6 +1400,16 @@
                     NSArray *pushArray = [notificationDic valueForKey:@"push"];
                     capabilities.notificationPush = [pushArray componentsJoinedByString:@","];
                 }
+                
+                // SPREED
+                
+                NSDictionary *spreedDic = [capabilitiesDict valueForKey:@"spreed"];
+                if (spreedDic) {
+                    capabilities.isSpreedServerEnabled = YES;
+                    NSArray *featuresArray = [capabilitiesDict valueForKey:@"features"];
+                    capabilities.spreedFeatures = [featuresArray componentsJoinedByString:@","];
+                }
+                
                 //FILES
             
                 NSDictionary *files = [capabilitiesDict valueForKey:@"files"];