diff --git a/android/java/org/chromium/chrome/browser/vpn/adapters/VpnServerAdapter.java b/android/java/org/chromium/chrome/browser/vpn/adapters/VpnServerAdapter.java index 08cd8ec467e..61e7d1afc6f 100644 --- a/android/java/org/chromium/chrome/browser/vpn/adapters/VpnServerAdapter.java +++ b/android/java/org/chromium/chrome/browser/vpn/adapters/VpnServerAdapter.java @@ -2,7 +2,7 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ - + package org.chromium.chrome.browser.vpn.adapters; import android.content.Context; diff --git a/components/brave_vpn/browser/brave_vpn_service.cc b/components/brave_vpn/browser/brave_vpn_service.cc index 59d8bd61b2c..d513e96143d 100644 --- a/components/brave_vpn/browser/brave_vpn_service.cc +++ b/components/brave_vpn/browser/brave_vpn_service.cc @@ -52,11 +52,11 @@ BraveVpnService::BraveVpnService( skus_service_getter_(skus_service_getter), api_request_(new BraveVpnAPIRequest(url_loader_factory)) { DCHECK(IsBraveVPNFeatureEnabled()); -#if !BUILDFLAG(IS_ANDROID) DCHECK(connection_manager); connection_manager_ = connection_manager; - observed_.Observe(connection_manager_); +#if !BUILDFLAG(IS_ANDROID) + observed_.Observe(connection_manager_); policy_pref_change_registrar_.Init(profile_prefs_); policy_pref_change_registrar_.Add( prefs::kManagedBraveVPNDisabled, @@ -238,33 +238,6 @@ void BraveVpnService::GetConnectionState(GetConnectionStateCallback callback) { std::move(callback).Run(state); } -void BraveVpnService::GetAllRegions(GetAllRegionsCallback callback) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - std::vector regions; - for (const auto& region : - connection_manager_->GetRegionDataManager().GetRegions()) { - regions.push_back(region.Clone()); - } - std::move(callback).Run(std::move(regions)); -} - -void BraveVpnService::GetSelectedRegion(GetSelectedRegionCallback callback) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - VLOG(2) << __func__; - - auto region_name = - connection_manager_->GetRegionDataManager().GetSelectedRegion(); - std::move(callback).Run(GetRegionPtrWithNameFromRegionList( - region_name, connection_manager_->GetRegionDataManager().GetRegions())); -} - -void BraveVpnService::SetSelectedRegion(mojom::RegionPtr region_ptr) { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - - VLOG(2) << __func__ << " : " << region_ptr->name_pretty; - connection_manager_->SetSelectedRegion(region_ptr->name); -} - void BraveVpnService::GetProductUrls(GetProductUrlsCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); std::move(callback).Run(mojom::ProductUrls::New( @@ -380,6 +353,33 @@ void BraveVpnService::UpdatePurchasedStateForSessionExpired( } #endif // !BUILDFLAG(IS_ANDROID) +void BraveVpnService::GetAllRegions(GetAllRegionsCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + std::vector regions; + for (const auto& region : + connection_manager_->GetRegionDataManager().GetRegions()) { + regions.push_back(region.Clone()); + } + std::move(callback).Run(std::move(regions)); +} + +void BraveVpnService::GetSelectedRegion(GetSelectedRegionCallback callback) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + VLOG(2) << __func__; + + auto region_name = + connection_manager_->GetRegionDataManager().GetSelectedRegion(); + std::move(callback).Run(GetRegionPtrWithNameFromRegionList( + region_name, connection_manager_->GetRegionDataManager().GetRegions())); +} + +void BraveVpnService::SetSelectedRegion(mojom::RegionPtr region_ptr) { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + + VLOG(2) << __func__ << " : " << region_ptr->name_pretty; + connection_manager_->SetSelectedRegion(region_ptr->name); +} + #if BUILDFLAG(IS_ANDROID) void BraveVpnService::GetPurchaseToken(GetPurchaseTokenCallback callback) { std::string purchase_token_string = ""; diff --git a/components/brave_vpn/browser/brave_vpn_service.h b/components/brave_vpn/browser/brave_vpn_service.h index c6659e42a6d..e64bf65a538 100644 --- a/components/brave_vpn/browser/brave_vpn_service.h +++ b/components/brave_vpn/browser/brave_vpn_service.h @@ -95,9 +95,6 @@ class BraveVpnService : void GetConnectionState(GetConnectionStateCallback callback) override; void Connect() override; void Disconnect() override; - void GetAllRegions(GetAllRegionsCallback callback) override; - void GetSelectedRegion(GetSelectedRegionCallback callback) override; - void SetSelectedRegion(mojom::RegionPtr region) override; void GetProductUrls(GetProductUrlsCallback callback) override; void CreateSupportTicket(const std::string& email, const std::string& subject, @@ -121,6 +118,10 @@ class BraveVpnService : void GetPurchasedState(GetPurchasedStateCallback callback) override; void LoadPurchasedState(const std::string& domain) override; + void GetAllRegions(GetAllRegionsCallback callback) override; + void GetSelectedRegion(GetSelectedRegionCallback callback) override; + void SetSelectedRegion(mojom::RegionPtr region) override; + void GetAllServerRegions(ResponseCallback callback); void GetServerRegionsWithCities(ResponseCallback callback); void GetTimezonesForRegions(ResponseCallback callback); @@ -219,13 +220,13 @@ class BraveVpnService : // Check initial purchased/connected state. void CheckInitialState(); + raw_ptr connection_manager_ = nullptr; #if !BUILDFLAG(IS_ANDROID) base::ScopedObservation observed_{this}; bool wait_region_data_ready_ = false; - raw_ptr connection_manager_ = nullptr; PrefChangeRegistrar policy_pref_change_registrar_; #endif // !BUILDFLAG(IS_ANDROID) diff --git a/components/brave_vpn/browser/brave_vpn_service_helper.cc b/components/brave_vpn/browser/brave_vpn_service_helper.cc index 7ef5f18c28c..d44e2cb4a1e 100644 --- a/components/brave_vpn/browser/brave_vpn_service_helper.cc +++ b/components/brave_vpn/browser/brave_vpn_service_helper.cc @@ -27,7 +27,7 @@ namespace brave_vpn { mojom::RegionPtr GetRegionPtrWithNameFromRegionList( const std::string& name, - const std::vector region_list) { + const std::vector& region_list) { auto it = base::ranges::find(region_list, name, &mojom::Region::name); if (it != region_list.end()) return it->Clone(); diff --git a/components/brave_vpn/browser/brave_vpn_service_helper.h b/components/brave_vpn/browser/brave_vpn_service_helper.h index c31cea266d9..6017cd555ec 100644 --- a/components/brave_vpn/browser/brave_vpn_service_helper.h +++ b/components/brave_vpn/browser/brave_vpn_service_helper.h @@ -24,7 +24,7 @@ class Value; namespace brave_vpn { mojom::RegionPtr GetRegionPtrWithNameFromRegionList( const std::string& name, - const std::vector region_list); + const std::vector& region_list); // False if subscription is expired. bool IsValidCredentialSummary(const base::Value& summary); diff --git a/components/brave_vpn/common/mojom/brave_vpn.mojom b/components/brave_vpn/common/mojom/brave_vpn.mojom index c81efcf9533..66f680c72f4 100644 --- a/components/brave_vpn/common/mojom/brave_vpn.mojom +++ b/components/brave_vpn/common/mojom/brave_vpn.mojom @@ -51,13 +51,10 @@ interface ServiceHandler { Disconnect(); // Gets all region from internal cache which is fetched from Guardian API - [EnableIfNot=is_android] GetAllRegions() => (array regions); - [EnableIfNot=is_android] GetSelectedRegion() => (Region current_region); - [EnableIfNot=is_android] SetSelectedRegion(Region region); [EnableIfNot=is_android]