[PR #2682] [MERGED] feature/rebased purchase android #2901

New issue

Closed

opened 2026-10-14 21:06:05 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-14 21:06:05 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/2682
Author: @NickVs2015
Created: 6/1/2026
Status: ✅ Merged
Merged: 8/28/2026
Merged by: @vkamn

Base: dev ← Head: feature/rebased-purchase-android

📝 Commits (10+)

953fd89 Add Google Play Billing Library
bba8e22 Disable Qt debugger sleep
65a30e2 Add billing module, provide a separate build for Google Play
fc354d8 Add a method to detect Google Play build
c00eca3 Add method to get the list of offers
f6b8632 Add methods to verify and purchase subscriptions
559ed4d refactor: modify response json
50ab8f0 feat: add purchase to UI
bec58b6 feat: add test purchase android
1dd3349 fix: merge with new structure, fix payment flow

📊 Changes

50 files changed (+2735 additions, -702 deletions)

View changed files

📝 .github/workflows/deploy.yml (+30 -4)
📝 client/amneziaApplication.cpp (+10 -0)
➕ client/android/billing/build.gradle.kts (+19 -0)
➕ client/android/billing/src/main/kotlin/BillingException.kt (+65 -0)
➕ client/android/billing/src/main/kotlin/BillingProvider.kt (+349 -0)
📝 client/android/build.gradle.kts (+117 -6)
📝 client/android/gradle/libs.versions.toml (+3 -1)
➕ client/android/oss/org/amnezia/vpn/BillingPaymentRepository.kt (+13 -0)
➕ client/android/play/org/amnezia/vpn/BillingPaymentRepository.kt (+34 -0)
📝 client/android/settings.gradle.kts (+1 -0)
📝 client/android/src/org/amnezia/vpn/AmneziaActivity.kt (+42 -10)
📝 client/android/src/org/amnezia/vpn/AmneziaApplication.kt (+4 -0)
➕ client/android/src/org/amnezia/vpn/BillingRepository.kt (+12 -0)
➕ client/android/utils/src/main/kotlin/ErrorCode.kt (+14 -0)
📝 client/cmake/android.cmake (+46 -0)
📝 client/cmake/ios.cmake (+0 -2)
📝 client/cmake/macos_ne.cmake (+0 -2)
📝 client/cmake/sources.cmake (+2 -0)
📝 client/core/controllers/api/servicesCatalogController.cpp (+138 -32)
➕ client/core/controllers/api/storePurchaseController.cpp (+760 -0)

...and 30 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/2682 **Author:** [@NickVs2015](https://github.com/NickVs2015) **Created:** 6/1/2026 **Status:** ✅ Merged **Merged:** 8/28/2026 **Merged by:** [@vkamn](https://github.com/vkamn) **Base:** `dev` ← **Head:** `feature/rebased-purchase-android` --- ### 📝 Commits (10+) - [`953fd89`](https://github.com/amnezia-vpn/amnezia-client/commit/953fd891571567338eadc7cdb24f93f726d88dd4) Add Google Play Billing Library - [`bba8e22`](https://github.com/amnezia-vpn/amnezia-client/commit/bba8e22dc4d7ae7850d160a9f7fe2c2ab1d5b526) Disable Qt debugger sleep - [`65a30e2`](https://github.com/amnezia-vpn/amnezia-client/commit/65a30e2deb9cbbfc5e834ffd18b8d6610b5e9f5a) Add billing module, provide a separate build for Google Play - [`fc354d8`](https://github.com/amnezia-vpn/amnezia-client/commit/fc354d863394b9a8441883fd9db1730741013e05) Add a method to detect Google Play build - [`c00eca3`](https://github.com/amnezia-vpn/amnezia-client/commit/c00eca3df30cb0a9db699b0ea7d4fd316eee307c) Add method to get the list of offers - [`f6b8632`](https://github.com/amnezia-vpn/amnezia-client/commit/f6b8632562035ba0c8d6f5f8be24a0f3547478a5) Add methods to verify and purchase subscriptions - [`559ed4d`](https://github.com/amnezia-vpn/amnezia-client/commit/559ed4d0ef7478d95ee90fba19e704a0cf91c25b) refactor: modify response json - [`50ab8f0`](https://github.com/amnezia-vpn/amnezia-client/commit/50ab8f03ab249033d5b4656a0aec6e487326b0e9) feat: add purchase to UI - [`bec58b6`](https://github.com/amnezia-vpn/amnezia-client/commit/bec58b64d063babeb486445e1ec7acee778686ca) feat: add test purchase android - [`1dd3349`](https://github.com/amnezia-vpn/amnezia-client/commit/1dd334999fe8bf6155f7b19cbe3a062605629106) fix: merge with new structure, fix payment flow ### 📊 Changes **50 files changed** (+2735 additions, -702 deletions) <details> <summary>View changed files</summary> 📝 `.github/workflows/deploy.yml` (+30 -4) 📝 `client/amneziaApplication.cpp` (+10 -0) ➕ `client/android/billing/build.gradle.kts` (+19 -0) ➕ `client/android/billing/src/main/kotlin/BillingException.kt` (+65 -0) ➕ `client/android/billing/src/main/kotlin/BillingProvider.kt` (+349 -0) 📝 `client/android/build.gradle.kts` (+117 -6) 📝 `client/android/gradle/libs.versions.toml` (+3 -1) ➕ `client/android/oss/org/amnezia/vpn/BillingPaymentRepository.kt` (+13 -0) ➕ `client/android/play/org/amnezia/vpn/BillingPaymentRepository.kt` (+34 -0) 📝 `client/android/settings.gradle.kts` (+1 -0) 📝 `client/android/src/org/amnezia/vpn/AmneziaActivity.kt` (+42 -10) 📝 `client/android/src/org/amnezia/vpn/AmneziaApplication.kt` (+4 -0) ➕ `client/android/src/org/amnezia/vpn/BillingRepository.kt` (+12 -0) ➕ `client/android/utils/src/main/kotlin/ErrorCode.kt` (+14 -0) 📝 `client/cmake/android.cmake` (+46 -0) 📝 `client/cmake/ios.cmake` (+0 -2) 📝 `client/cmake/macos_ne.cmake` (+0 -2) 📝 `client/cmake/sources.cmake` (+2 -0) 📝 `client/core/controllers/api/servicesCatalogController.cpp` (+138 -32) ➕ `client/core/controllers/api/storePurchaseController.cpp` (+760 -0) _...and 30 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-14 21:06:05 +00:00

closed this issue
added the
pull-request
label

No labels

pull-request

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

amnezia-vpn/amnezia-client#2901

No description provided.

Rows
Columns