marinofaggiana 6 жил өмнө
parent
commit
6257efc6cf

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

@@ -29,9 +29,16 @@
 @property double trialRemainingSec;
 @property double trialEndTime;
 @property (nonatomic, strong) NSString *trialEnd;
+
 @property BOOL accountRemoveExpired;
 @property double accountRemoveRemainingSec;
 @property double accountRemoveTime;
 @property (nonatomic, strong) NSString *accountRemove;
 
+@property (nonatomic, strong) NSString *nextGroupExpirationGroup;
+@property BOOL nextGroupExpirationGroupExpired;
+@property double nextGroupExpirationExpiresTime;
+@property (nonatomic, strong) NSString *nextGroupExpirationExpires;
+
+
 @end

+ 16 - 1
iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -3259,7 +3259,7 @@
         //Parse
         NSError *error;
         NSDictionary *jsongParsed = [NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingMutableContainers error:&error];
-        NSLog(@"[LOG] User Profile : %@",jsongParsed);
+        NSLog(@"[LOG] User Profile Features : %@",jsongParsed);
         
         if (jsongParsed && jsongParsed.allKeys > 0) {
             
@@ -3299,6 +3299,21 @@
                 if ([data valueForKey:@"account_remove"] && ![[data valueForKey:@"account_remove"] isKindOfClass:[NSNull class]])
                     features.accountRemove = [data valueForKey:@"account_remove"];
                 
+                NSDictionary *nextGroupExpirationDic = [data valueForKey:@"next_group_expiration"];
+                if (nextGroupExpirationDic) {
+                    if ([nextGroupExpirationDic valueForKey:@"group"] && ![[nextGroupExpirationDic valueForKey:@"group"] isKindOfClass:[NSNull class]])
+                        features.nextGroupExpirationGroup = [data valueForKey:@"group"];
+                    
+                    if ([nextGroupExpirationDic valueForKey:@"group_expired"] && ![[nextGroupExpirationDic valueForKey:@"group_expired"] isKindOfClass:[NSNull class]])
+                        features.nextGroupExpirationGroupExpired = [[nextGroupExpirationDic valueForKey:@"group_expired"] boolValue];
+                    
+                    if ([nextGroupExpirationDic valueForKey:@"expires_time"] && ![[nextGroupExpirationDic valueForKey:@"expires_time"] isKindOfClass:[NSNull class]])
+                        features.nextGroupExpirationExpiresTime = [[nextGroupExpirationDic valueForKey:@"expires_time"] integerValue];
+                    
+                    if ([nextGroupExpirationDic valueForKey:@"expires"] && ![[nextGroupExpirationDic valueForKey:@"expires"] isKindOfClass:[NSNull class]])
+                        features.nextGroupExpirationExpires = [data valueForKey:@"expires"];
+                }
+                
                 successRequest(response, features, request.redirectedServer);
                 
             } else {