feat: renewal new status logic (#2409)

* fix: renewal add status logic

* fix: wakeup activity resumed android

client/ui/models/api/apiAccountInfoModel.cpp

@@ -78,7 +78,6 @@ QVariant ApiAccountInfoModel::data(const QModelIndex &index, int role) const
     }
     case IsSubscriptionExpiredRole: {
         if (m_accountInfoData.configType == apiDefs::ConfigType::AmneziaFreeV3) return false;
-        if (m_isSubscriptionExpiredByServer) return true;
         if (m_accountInfoData.subscriptionEndDate.isEmpty()) return false;
         return apiUtils::isSubscriptionExpired(m_accountInfoData.subscriptionEndDate);
     }
@@ -87,7 +86,7 @@ QVariant ApiAccountInfoModel::data(const QModelIndex &index, int role) const
         if (m_accountInfoData.subscriptionEndDate.isEmpty()) return false;
         if (apiUtils::isSubscriptionExpired(m_accountInfoData.subscriptionEndDate)) return false;
         QDateTime endDate = QDateTime::fromString(m_accountInfoData.subscriptionEndDate, Qt::ISODateWithMs);
-        return endDate <= QDateTime::currentDateTimeUtc().addDays(30);
+        return endDate <= QDateTime::currentDateTimeUtc().addDays(10);
     }
     }
 
@@ -98,8 +97,6 @@ void ApiAccountInfoModel::updateModel(const QJsonObject &accountInfoObject, cons
 {
     beginResetModel();
 
-    m_isSubscriptionExpiredByServer = false;
-
     AccountInfoData accountInfoData;
 
     m_availableCountries = accountInfoObject.value(apiDefs::key::availableCountries).toArray();
@@ -124,13 +121,6 @@ void ApiAccountInfoModel::updateModel(const QJsonObject &accountInfoObject, cons
     endResetModel();
 }
 
-void ApiAccountInfoModel::setSubscriptionExpiredByServer()
-{
-    beginResetModel();
-    m_isSubscriptionExpiredByServer = true;
-    endResetModel();
-}
-
 QVariant ApiAccountInfoModel::data(const QString &roleString)
 {
     QModelIndex modelIndex = index(0);

client/ui/models/api/apiAccountInfoModel.h

@@ -33,8 +33,6 @@ public:
 public slots:
     void updateModel(const QJsonObject &accountInfoObject, const QJsonObject &serverConfig);
     QVariant data(const QString &roleString);
-    void setSubscriptionExpiredByServer();
-
     QJsonArray getAvailableCountries();
     QJsonArray getIssuedConfigsInfo();
 
@@ -62,7 +60,6 @@ private:
     };
 
     AccountInfoData m_accountInfoData;
-    bool m_isSubscriptionExpiredByServer = false;
     QJsonArray m_availableCountries;
     QJsonArray m_issuedConfigsInfo;
     QJsonObject m_supportInfo;

client/ui/models/servers_model.cpp

@@ -179,6 +179,20 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     case AdEndpointRole: {
         return apiConfig.value(apiDefs::key::serviceInfo).toObject().value(apiDefs::key::adEndpoint).toString();
     }
+    case IsSubscriptionExpiredRole: {
+        if (configVersion != apiDefs::ConfigSource::AmneziaGateway) return false;
+        QString endDate = apiConfig.value(apiDefs::key::subscriptionEndDate).toString();
+        if (endDate.isEmpty()) return false;
+        return apiUtils::isSubscriptionExpired(endDate);
+    }
+    case IsSubscriptionExpiringSoonRole: {
+        if (configVersion != apiDefs::ConfigSource::AmneziaGateway) return false;
+        QString endDate = apiConfig.value(apiDefs::key::subscriptionEndDate).toString();
+        if (endDate.isEmpty()) return false;
+        if (apiUtils::isSubscriptionExpired(endDate)) return false;
+        QDateTime endDateTime = QDateTime::fromString(endDate, Qt::ISODateWithMs);
+        return endDateTime <= QDateTime::currentDateTimeUtc().addDays(10);
+    }
     }
 
     return QVariant();
@@ -443,6 +457,9 @@ QHash<int, QByteArray> ServersModel::roleNames() const
     roles[AdDescriptionRole] = "adDescription";
     roles[AdEndpointRole] = "adEndpoint";
 
+    roles[IsSubscriptionExpiredRole] = "isSubscriptionExpired";
+    roles[IsSubscriptionExpiringSoonRole] = "isSubscriptionExpiringSoon";
+
     return roles;
 }
 

client/ui/models/servers_model.h

@@ -52,6 +52,9 @@ public:
         AdDescriptionRole,
         AdEndpointRole,
 
+        IsSubscriptionExpiredRole,
+        IsSubscriptionExpiringSoonRole,
+
         HasAmneziaDns
     };