fix & new db version

iOSClient/AppDelegate.m

@@ -270,7 +270,7 @@ PKPushRegistry *pushRegistry;
     // Brand
 #if defined(HC)
     tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
-    if (account.hcIsTrial == true) {
+    if (account.hcIsTrial == true || account.hcTrialExpired == true || account.hcNextGroupExpirationGroupExpired == true) {
         
         HCTrial *vc = [[UIStoryboard storyboardWithName:@"HCTrial" bundle:nil] instantiateInitialViewController];
         vc.account = account;

iOSClient/CCGlobal.h

@@ -82,7 +82,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         50
+#define k_databaseSchemaVersion                         51
 
 // Intro selector
 #define k_intro_login                                   0
@@ -300,7 +300,6 @@
 #define k_nextcloud_version_13_0                        13
 #define k_nextcloud_version_14_0                        14
 #define k_nextcloud_version_15_0                        15
-#define k_nextcloud_version_16_0                        16
 
 // -----------------------------------------------------------------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------

iOSClient/Database/NCDatabase.swift

@@ -72,6 +72,10 @@ class tableAccount: Object {
     @objc dynamic var hcAccountRemoveExpired: Bool = false
     @objc dynamic var hcAccountRemoveRemainingSec: Double = 0
     @objc dynamic var hcAccountRemoveTime: NSDate? = nil
+    @objc dynamic var hcNextGroupExpirationGroup = ""
+    @objc dynamic var hcNextGroupExpirationGroupExpired: Bool = false
+    @objc dynamic var hcNextGroupExpirationExpiresTime: NSDate? = nil
+    @objc dynamic var hcNextGroupExpirationExpires = ""
     
     override static func primaryKey() -> String {
         return "account"

iOSClient/Database/NCManageDatabase.swift

@@ -515,6 +515,7 @@ class NCManageDatabase: NSObject {
                 } else {
                     result.hcTrialEndTime = nil
                 }
+                
                 result.hcAccountRemoveExpired = features.accountRemoveExpired
                 result.hcAccountRemoveRemainingSec = features.accountRemoveRemainingSec
                 if features.accountRemoveTime > 0 {
@@ -523,6 +524,15 @@ class NCManageDatabase: NSObject {
                     result.hcAccountRemoveTime = nil
                 }
                 
+                result.hcNextGroupExpirationGroup = features.nextGroupExpirationGroup
+                result.hcNextGroupExpirationGroupExpired = features.nextGroupExpirationGroupExpired
+                if features.nextGroupExpirationExpiresTime > 0 {
+                    result.hcNextGroupExpirationExpiresTime = Date(timeIntervalSince1970: features.nextGroupExpirationExpiresTime) as NSDate
+                } else {
+                    result.hcNextGroupExpirationExpiresTime = nil
+                }
+                result.hcNextGroupExpirationExpires = features.nextGroupExpirationExpires
+                
                 returnAccount = result
             }
         } catch let error {

iOSClient/Library/OCCommunicationLib/HCFeatures.m

@@ -30,6 +30,8 @@
     
     self.trialEnd = @"";
     self.accountRemove = @"";
+    self.nextGroupExpirationGroup = @"";
+    self.nextGroupExpirationExpires = @"";
     
     return self;
 }

iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -3302,7 +3302,7 @@
                 NSDictionary *nextGroupExpirationDic = [data valueForKey:@"next_group_expiration"];
                 if (nextGroupExpirationDic) {
                     if ([nextGroupExpirationDic valueForKey:@"group"] && ![[nextGroupExpirationDic valueForKey:@"group"] isKindOfClass:[NSNull class]])
-                        features.nextGroupExpirationGroup = [data valueForKey:@"group"];
+                        features.nextGroupExpirationGroup = [nextGroupExpirationDic valueForKey:@"group"];
                     
                     if ([nextGroupExpirationDic valueForKey:@"group_expired"] && ![[nextGroupExpirationDic valueForKey:@"group_expired"] isKindOfClass:[NSNull class]])
                         features.nextGroupExpirationGroupExpired = [[nextGroupExpirationDic valueForKey:@"group_expired"] boolValue];
@@ -3311,7 +3311,7 @@
                         features.nextGroupExpirationExpiresTime = [[nextGroupExpirationDic valueForKey:@"expires_time"] integerValue];
                     
                     if ([nextGroupExpirationDic valueForKey:@"expires"] && ![[nextGroupExpirationDic valueForKey:@"expires"] isKindOfClass:[NSNull class]])
-                        features.nextGroupExpirationExpires = [data valueForKey:@"expires"];
+                        features.nextGroupExpirationExpires = [nextGroupExpirationDic valueForKey:@"expires"];
                 }
                 
                 successRequest(response, features, request.redirectedServer);