fix: upgrade existing android subscription and add renew logic

Author: NickVs2015

CMakeLists.txt

@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(PROJECT AmneziaVPN)
-set(AMNEZIAVPN_VERSION 5.0.0.6)
+set(AMNEZIAVPN_VERSION 5.0.1.3)
 
 set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON CACHE BOOL "" FORCE)
 set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES
@@ -28,7 +28,7 @@ string(TIMESTAMP CURRENT_DATE "%Y-%m-%d")
 set(RELEASE_DATE "${CURRENT_DATE}")
 
 set(APP_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR}.${CMAKE_PROJECT_VERSION_MINOR}.${CMAKE_PROJECT_VERSION_PATCH})
-set(APP_ANDROID_VERSION_CODE 2141)
+set(APP_ANDROID_VERSION_CODE 2143)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     set(MZ_PLATFORM_NAME "linux")

client/android/billing/src/main/kotlin/BillingProvider.kt

@@ -262,9 +262,13 @@ class BillingProvider(context: Context) : AutoCloseable {
             .build()
 
         val subscriptionUpdateParams = oldPurchaseToken?.let {
+            // Per Google Play docs, switching between auto-renewing plans within the same
+            // subscription only supports CHARGE_FULL_PRICE or WITHOUT_PRORATION - any other mode
+            // (e.g. CHARGE_PRORATED_PRICE) is rejected with DEVELOPER_ERROR "Requested replacement
+            // mode is not supported for this request".
             BillingFlowParams.SubscriptionUpdateParams.newBuilder()
                 .setOldPurchaseToken(oldPurchaseToken)
-                .setSubscriptionReplacementMode(ReplacementMode.WITHOUT_PRORATION)
+                .setSubscriptionReplacementMode(ReplacementMode.CHARGE_FULL_PRICE)
                 .build()
         }
 

client/core/controllers/api/subscriptionController.cpp

@@ -981,6 +981,22 @@ ErrorCode SubscriptionController::processPlayMarketPurchase(const QString &userC
     QObject::connect(&watcher, &QFutureWatcher<QPair<bool, QString>>::finished, &waitLoop, &QEventLoop::quit);
 
     QFuture<QPair<bool, QString>> future = QtConcurrent::run([androidController, productId]() {
+        // If the user already has an active "premium" subscription, upgrade/replace it with proration
+        // instead of stacking a second, independent purchase that Google Play would just queue behind it.
+        QString oldPurchaseToken;
+        QJsonObject existingPurchasesResult = androidController->queryPurchases();
+        if (existingPurchasesResult.value("responseCode").toInt(-1) == 0) {
+            const QJsonArray existingPurchases = existingPurchasesResult.value("purchases").toArray();
+            for (const QJsonValue &purchaseValue : existingPurchases) {
+                const QJsonObject existingPurchase = purchaseValue.toObject();
+                if (existingPurchase.value("purchaseState").toInt(-1) == 1) { // PURCHASED
+                    oldPurchaseToken = existingPurchase.value("purchaseToken").toString();
+                    qInfo() << "[Billing] Found existing active subscription, will upgrade instead of purchasing a new one";
+                    break;
+                }
+            }
+        }
+
         QJsonObject plansResult = androidController->getSubscriptionPlans();
         int responseCode = plansResult.value("responseCode").toInt(-1);
         if (responseCode != 0) {
@@ -998,11 +1014,18 @@ ErrorCode SubscriptionController::processPlayMarketPurchase(const QString &userC
                 if (offer.value("basePlanId").toString() != productId) continue;
 
                 const QString token = offer.value("offerToken").toString();
-                if (fallbackOfferToken.isEmpty()) fallbackOfferToken = token;
-
                 QJsonArray pricingPhases = offer.value("pricingPhases").toArray();
                 const bool hasFreeTrial = !pricingPhases.isEmpty()
                         && pricingPhases.first().toObject().value("priceAmountMicros").toDouble() == 0;
+
+                // Google Play's subscription replacement API rejects switching to an offer with an
+                // introductory/trial phase ("Requested replacement mode is not supported for this
+                // request"), so an upgrade must always target the regular, non-trial offer - skip
+                // trial offers entirely here rather than just deprioritizing them.
+                if (hasFreeTrial && !oldPurchaseToken.isEmpty()) continue;
+
+                if (fallbackOfferToken.isEmpty()) fallbackOfferToken = token;
+
                 if (hasFreeTrial) {
                     offerToken = token;
                     qInfo() << "[Billing] Found free trial offer for basePlanId:" << productId;
@@ -1016,7 +1039,9 @@ ErrorCode SubscriptionController::processPlayMarketPurchase(const QString &userC
             qWarning() << "[Billing] No offer token found for basePlanId:" << productId;
             return qMakePair(false, QString());
         }
-        QJsonObject purchaseResult = androidController->purchaseSubscription(offerToken);
+        QJsonObject purchaseResult = oldPurchaseToken.isEmpty()
+                ? androidController->purchaseSubscription(offerToken)
+                : androidController->upgradeSubscription(offerToken, oldPurchaseToken);
         responseCode = purchaseResult.value("responseCode").toInt(-1);
         if (responseCode != 0) {
             qWarning() << "[Billing] Purchase failed, responseCode:" << responseCode;