andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-24 02:00:24 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: add support market types, add logs

Browse Source
This commit is contained in:
NickVs2015
2026-06-05 14:10:53 +03:00
parent 9d0cc3a135
commit 5aae432220
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/android/billing/src/main/kotlin/BillingProvider.kt
+1
View File
@@ -237,6 +237,7 @@ class BillingProvider(context: Context) : AutoCloseable {
private fun processPurchases(purchases: List<Purchase>?): JSONArray { private fun processPurchases(purchases: List<Purchase>?): JSONArray {
val purchaseArray = JSONArray() val purchaseArray = JSONArray()
purchases?.forEach { purchase -> purchases?.forEach { purchase ->
Log.v(TAG, "processPurchases: purchaseToken=${purchase.purchaseToken} orderId=${purchase.orderId} state=${purchase.purchaseState}")
/* val purchaseJson = */ JSONObject().also { purchaseArray.put(it) } /* val purchaseJson = */ JSONObject().also { purchaseArray.put(it) }
.put("purchaseToken", purchase.purchaseToken) .put("purchaseToken", purchase.purchaseToken)
.put("purchaseTime", purchase.purchaseTime) .put("purchaseTime", purchase.purchaseTime)
client/core/controllers/api/servicesCatalogController.cpp
+6
View File
@@ -217,6 +217,12 @@ ErrorCode ServicesCatalogController::fillAvailableServices(QJsonObject &services
apiPayload[apiDefs::key::appVersion] = QString(APP_VERSION); apiPayload[apiDefs::key::appVersion] = QString(APP_VERSION);
apiPayload[apiDefs::key::cliName] = QString(APPLICATION_NAME); apiPayload[apiDefs::key::cliName] = QString(APPLICATION_NAME);
apiPayload[apiDefs::key::appLanguage] = m_appSettingsRepository->getAppLanguage().name().split("_").first(); apiPayload[apiDefs::key::appLanguage] = m_appSettingsRepository->getAppLanguage().name().split("_").first();
#if defined(Q_OS_ANDROID)
apiPayload[apiDefs::key::market] = QStringLiteral("playmarket");
#else
apiPayload[apiDefs::key::market] = QStringLiteral("appstore");
#endif
QByteArray responseBody; QByteArray responseBody;
ErrorCode errorCode = executeRequest(QString("%1v1/services"), apiPayload, responseBody); ErrorCode errorCode = executeRequest(QString("%1v1/services"), apiPayload, responseBody);
client/core/controllers/api/subscriptionController.cpp
+2 -2
View File
@@ -1085,9 +1085,9 @@ SubscriptionController::PlayMarketRestoreResult SubscriptionController::processP
checkPayload[apiDefs::key::transactionId] = purchaseToken; checkPayload[apiDefs::key::transactionId] = purchaseToken;
QByteArray checkResponse; QByteArray checkResponse;
qWarning() << "[Billing] v1/subscriptions request:" << QJsonDocument(checkPayload).toJson(QJsonDocument::Compact); qWarning() << "[Billing][processPlayMarketRestore] v1/subscriptions request:" << QJsonDocument(checkPayload).toJson(QJsonDocument::Compact);
ErrorCode checkError = executeRequest(QString("%1v1/subscriptions"), checkPayload, checkResponse, false); ErrorCode checkError = executeRequest(QString("%1v1/subscriptions"), checkPayload, checkResponse, false);
qWarning() << "[Billing] v1/subscriptions errorCode:" << static_cast<int>(checkError) << "response:" << checkResponse; qWarning() << "[Billing][processPlayMarketRestore] v1/subscriptions errorCode:" << static_cast<int>(checkError) << "response:" << checkResponse;
if (checkError != ErrorCode::NoError) { if (checkError != ErrorCode::NoError) {
qWarning().noquote() << "[Billing] Initial subscriptions check failed:" << static_cast<int>(checkError); qWarning().noquote() << "[Billing] Initial subscriptions check failed:" << static_cast<int>(checkError);
result.errorCode = checkError; result.errorCode = checkError;
client/core/utils/constants/apiKeys.h
+1
View File
@@ -40,6 +40,7 @@ namespace apiDefs
constexpr QLatin1String lastDownloaded("last_downloaded"); constexpr QLatin1String lastDownloaded("last_downloaded");
constexpr QLatin1String sourceType("source_type"); constexpr QLatin1String sourceType("source_type");
constexpr QLatin1String appLanguage("app_language"); constexpr QLatin1String appLanguage("app_language");
constexpr QLatin1String market("market");
constexpr QLatin1String activeDeviceCount("active_device_count"); constexpr QLatin1String activeDeviceCount("active_device_count");
constexpr QLatin1String maxDeviceCount("max_device_count"); constexpr QLatin1String maxDeviceCount("max_device_count");