Update billing dependency and update VPN code #19576

deeppandya · 2023-08-04T15:38:28Z

Resolves brave/brave-browser#30673
Security review : https://github.com/brave/reviews/issues/1323

Submitter Checklist:

I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
There is a ticket for my issue
Used Github auto-closing keywords in the PR description above
Wrote a good PR/commit description
Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
Checked the PR locally:
- npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
- npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
Ran git rebase master (if needed)

Reviewer Checklist:

A security review is not needed, or a link to one is included in the PR description
New files have MPL-2.0 license header
Adequate test coverage exists to prevent regressions
Major classes, functions and non-trivial code blocks are well-commented
Changes in component dependencies are properly reflected in gn
Code follows the style guide
Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

third_party/android_deps/libs/com_google_firebase_firebase_encoders_proto/README.chromium

samartnik

lgtm

tapanmodh

lgtm

bridiver · 2023-09-05T19:00:58Z

third_party/android_deps/BUILD.gn

@@ -7,6 +7,8 @@ group("android_deps") {
    ":com_android_installreferrer_java",
    ":com_brave_playlist_java",
    ":com_github_bumptech_glide_java",
+    ":com_google_android_datatransport_transport_backend_cct_java",


android_deps target does not appear to actually be used anywhere so can we just remove it?

bridiver · 2023-09-05T19:02:07Z

build/android/config.gni

@@ -44,6 +44,8 @@ brave_chrome_java_deps = [
  "//brave/third_party/android_deps:com_android_installreferrer_java",
  "//brave/third_party/android_deps:com_brave_playlist_java",
  "//brave/third_party/android_deps:com_github_bumptech_glide_java",
+  "//brave/third_party/android_deps:com_google_android_datatransport_transport_backend_cct_java",


we should not be adding indirect deps to this list. Only add direct deps here (the java imports you actually reference). Indirect deps are handled automatically and should not be added individually.

bridiver · 2023-09-05T19:23:59Z

patches/third_party-android_deps-BUILD.gn.patch

+     ":*",
+     "//third_party/androidx:*",
+   ]
+  visibility += [ "//chrome/android:chrome_java", "//brave/third_party/android_deps:com_google_android_datatransport_transport_runtime_java__classes" ] supports_android = true


this list should only contain com_google_android_datatransport_transport_runtime_java__classes because you shouldn't be adding this dep directly to chrome_brave_java_deps

bridiver · 2023-09-07T23:38:39Z

android/java/org/chromium/chrome/browser/vpn/billing/billing_sources.gni

@@ -0,0 +1,9 @@
+# Copyright (c) 2023 The Brave Authors. All rights reserved.


just sources.gni is the convention

Update existing code with livedata

Update plan UI Update vpn state with connection state

Add refs to sources

Update existing code to adapt to new changes with InAppBillingWrapper

Resolve rebase error Remove indirect deps Resolve presubmit error

Update billing dependency and update VPN code

hffvld · 2023-09-12T17:34:54Z

Verified Fresh install flow on Pixel 7 using version(s):

Device/OS: Pixel 7 [panther_beta-user 14 UPB5.230623.009 release-keys]
Brave build: 1.60.14
Chromium: 117.0.5938.48 (Official Build) canary (64-bit)
Revision: 988f725c9e62f571c6622c233aa00ae129504fd3

STEPS:

Install Brave Nightly build from this link
Launch Brave > Enable VPN and VPN Staging in QA settings > Relaunch Brave
Three-dot menu > Brave VPN > Purchase subscription > Verify
Tap Install VPN Profile > Ok > Verify

ACTUAL RESULTS:

Verified that no Brave crash is happening when enabling VPN on Android 14
Verified that Restore button is not shown when no active VPN subscription is available
Verified that a new VPN subscription can be purchased
Verified that no error message is shown when trying to Install VPN Profile for the first time
Verified that VPN is enabled successfully
Verified connectin VPN to different countries is working
Verified VPN sync is working cross-platform (Android, iOS, Web) when a subscription purchased on Android

1	2

No Brave Crash and no VPN profile error message

timestamp_09-40-59_09-41-47.mp4

Restore button when an active subscription is available

timestamp_10-32-37_10-33-12.mp4

hffvld · 2023-09-12T22:02:51Z

Verified Upgrade install flow on Pixel 7 using version(s):

Device/OS: Pixel 7 [panther_beta-user 14 UPB5.230623.009 release-keys]
Brave build: 1.60.17
Chromium: 117.0.5938.48 (Official Build) canary (64-bit)
Revision: 1e992619df2f5f217c5a422fed2fef524683373b

"Restore" button when no active subscription

STEPS:

Install Brave Nightly build 1.59.76 with C116 from Play Store
Launch Brave > Enable VPN and VPN Staging in QA settings > Relaunch Brave
Three-dot menu > Brave VPN > Observe Restore button even when no subscription is available
Upgrade Brave to build 1.60.17 with C117
Launch Brave > Three-dot menu > Brave VPN > Verify

ACTUAL RESULTS:

Verified that no Brave crash is happening
Verified that Restore button is not shown when no active VPN subscription is available

1

Untitled.mp4

"Restore" button when an active subscription is available

STEPS:

Install Brave Nightly build 1.59.76 with C116 from Play Store
Launch Brave > Enable VPN and VPN Staging in QA settings > Relaunch Brave
Three-dot menu > Brave VPN > Purchase a new subscription and Install VPN profile
Uninstall Brave > Install build 1.59.76 again and go through onboarding
Upgrade Brave to build 1.60.17 with C117
Launch Brave > Three-dot menu > Brave VPN
Tap Restore button > Install VPN Profile > Verify

ACTUAL RESULTS:

Verified that no Brave crash is happening
Verified that Restore button is shown when an active VPN subscription is available
Verified that no error message is shown when trying to Install VPN Profile for the first time
Verified that restore VPN subscription is working

1

timestamp_14-43-03_14-45-27_2.mov

* Merge pull request #19576 from brave/billing_client_6_0_android Update billing dependency and update VPN code * Add foreground service type for wireguard service * Update manifest Add livedata for purchases Update livedata implementation * Resolve presubmit error * Resolve formatting error

github-actions bot assigned deeppandya Aug 4, 2023

deeppandya commented Aug 4, 2023

View reviewed changes

third_party/android_deps/libs/com_google_firebase_firebase_encoders_proto/README.chromium Outdated Show resolved Hide resolved

deeppandya changed the title ~~Billing client 6 0 android~~ [WIP] Billing client 6 0 android Aug 4, 2023

deeppandya force-pushed the billing_client_6_0_android branch 3 times, most recently from cd4f863 to b6a38e5 Compare August 25, 2023 05:50

deeppandya changed the title ~~[WIP] Billing client 6 0 android~~ Update billing dependency and update VPN code Aug 25, 2023

deeppandya requested review from samartnik, tapanmodh and Pavneet-Sing August 28, 2023 11:59

deeppandya added this to the 1.59.x - Nightly milestone Aug 28, 2023

deeppandya force-pushed the billing_client_6_0_android branch from fa1cb99 to 2812f69 Compare August 28, 2023 12:34

deeppandya marked this pull request as ready for review August 28, 2023 12:36

deeppandya requested review from bridiver and a team as code owners August 28, 2023 12:36

samartnik approved these changes Aug 28, 2023

View reviewed changes

tapanmodh approved these changes Aug 30, 2023

View reviewed changes

samartnik mentioned this pull request Sep 1, 2023

Upgrade from Chromium 116 to Chromium 117. brave/brave-browser#31768

Closed

bridiver reviewed Sep 5, 2023

View reviewed changes

samartnik mentioned this pull request Sep 6, 2023

Upgrade from Chromium 116 to Chromium 117 #19398

Merged

25 tasks

deeppandya force-pushed the billing_client_6_0_android branch from 2812f69 to 328769c Compare September 7, 2023 13:01

deeppandya requested a review from bridiver September 7, 2023 13:01

deeppandya force-pushed the billing_client_6_0_android branch from 1754a35 to 3cfa329 Compare September 7, 2023 18:52

bridiver reviewed Sep 7, 2023

View reviewed changes

bridiver approved these changes Sep 7, 2023

View reviewed changes

deeppandya added 3 commits September 8, 2023 02:03

Add new deps for 6.0

4ff2768

Add missing deps for billing client

3eb2a37

Update existing changes with async query purchase function

437a6d1

deeppandya added 14 commits September 8, 2023 02:03

Update dependencies

ee6c28f

Add livedata fro query purchases

f385e33

Update existing code with livedata

3d7a742

Update sku details with product details

bb52ae1

Update code to check for active purchases

7f9c142

Add livedata for billing client state

838d1a7

Update existing code with livedata

Update livedata behavior for connection

99f2449

Update plan UI Update vpn state with connection state

Resolve presubmit issues

166d75a

Update firebase proto license

18cf1c7

ADd .gn patch for autovalue deps

9588343

Add sources.gni for billing client

a85f753

Add refs to sources

Update direct dependency for billing client

6c3e315

Update existing code to adapt to new changes with InAppBillingWrapper

Update third_party/android/deps/BUILD.gn patch

40b7170

Resolve rebase error Remove indirect deps Resolve presubmit error

Change name for billing sources

9f12b6f

deeppandya force-pushed the billing_client_6_0_android branch from 3cfa329 to 9f12b6f Compare September 8, 2023 06:20

deeppandya merged commit c74ae6f into master Sep 8, 2023

deeppandya deleted the billing_client_6_0_android branch September 8, 2023 16:22

deeppandya modified the milestones: 1.59.x - Beta, 1.60.x - Nightly Sep 8, 2023

bsclifton mentioned this pull request Sep 11, 2023

[Android 14] Brave crashes on C117 build when VPN is enabled. brave/brave-browser#32878

Closed

deeppandya added a commit that referenced this pull request Sep 11, 2023

Merge pull request #19576 from brave/billing_client_6_0_android

6bdb1f8

Update billing dependency and update VPN code

deeppandya added a commit that referenced this pull request Sep 11, 2023

Merge pull request #19576 from brave/billing_client_6_0_android

2a6d13a

Update billing dependency and update VPN code

This was referenced Sep 11, 2023

Billing client 6 0 android (Uplift to 1.58.x) #20101

Merged

Billing client 6 0 android (Uplift to 1.59.x) #20102

Merged

This was referenced Jan 12, 2024

VPN restore fails if the app gets updated via a different account where the purchase isn't made brave/brave-browser#23969

Closed

VPN shows connected when in fact its disconnected brave/brave-browser#23073

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update billing dependency and update VPN code #19576

Update billing dependency and update VPN code #19576

deeppandya commented Aug 4, 2023 •

edited

Loading

samartnik left a comment

tapanmodh left a comment

bridiver Sep 5, 2023

bridiver Sep 5, 2023

bridiver Sep 5, 2023

bridiver Sep 7, 2023

hffvld commented Sep 12, 2023 •

edited

Loading

hffvld commented Sep 12, 2023

		@@ -0,0 +1,9 @@
		# Copyright (c) 2023 The Brave Authors. All rights reserved.

Update billing dependency and update VPN code #19576

Update billing dependency and update VPN code #19576

Conversation

deeppandya commented Aug 4, 2023 • edited Loading

Submitter Checklist:

Reviewer Checklist:

After-merge Checklist:

Test Plan:

samartnik left a comment

Choose a reason for hiding this comment

tapanmodh left a comment

Choose a reason for hiding this comment

bridiver Sep 5, 2023

Choose a reason for hiding this comment

bridiver Sep 5, 2023

Choose a reason for hiding this comment

bridiver Sep 5, 2023

Choose a reason for hiding this comment

bridiver Sep 7, 2023

Choose a reason for hiding this comment

hffvld commented Sep 12, 2023 • edited Loading

hffvld commented Sep 12, 2023

deeppandya commented Aug 4, 2023 •

edited

Loading

hffvld commented Sep 12, 2023 •

edited

Loading