diff --git a/android/java/org/chromium/chrome/browser/vpn/activities/VpnServerSelectionActivity.java b/android/java/org/chromium/chrome/browser/vpn/activities/VpnServerSelectionActivity.java index 56286e57a29..58322f16ae6 100644 --- a/android/java/org/chromium/chrome/browser/vpn/activities/VpnServerSelectionActivity.java +++ b/android/java/org/chromium/chrome/browser/vpn/activities/VpnServerSelectionActivity.java @@ -150,7 +150,6 @@ public class VpnServerSelectionActivity extends BraveVpnParentActivity showProgress(); if (mServiceHandler != null) { mServiceHandler.getAllRegions( - BraveVpnConstants.REGION_PRECISION_CITY_BY_COUNTRY, regions -> { if (regions.length > 0) { mBraveVpnServerSelectionAdapter = diff --git a/components/brave_vpn/browser/brave_vpn_service.cc b/components/brave_vpn/browser/brave_vpn_service.cc index 77962e35fe0..24b5b55aaad 100644 --- a/components/brave_vpn/browser/brave_vpn_service.cc +++ b/components/brave_vpn/browser/brave_vpn_service.cc @@ -401,14 +401,13 @@ bool BraveVpnService::IsCurrentRegionSelectedAutomatically( #endif // !BUILDFLAG(IS_ANDROID) -void BraveVpnService::GetAllRegions(const std::string& region_precision, - GetAllRegionsCallback callback) { +void BraveVpnService::GetAllRegions(GetAllRegionsCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); #if BUILDFLAG(IS_ANDROID) api_request_->GetServerRegions( base::BindOnce(&BraveVpnService::OnFetchRegionList, base::Unretained(this), std::move(callback)), - region_precision); + brave_vpn::mojom::kRegionPrecisionCityByCountry); #else std::vector regions; for (const auto& region : diff --git a/components/brave_vpn/browser/brave_vpn_service.h b/components/brave_vpn/browser/brave_vpn_service.h index 66e2c2ee008..b1884b5f2cf 100644 --- a/components/brave_vpn/browser/brave_vpn_service.h +++ b/components/brave_vpn/browser/brave_vpn_service.h @@ -128,8 +128,7 @@ class BraveVpnService : void GetPurchasedState(GetPurchasedStateCallback callback) override; void LoadPurchasedState(const std::string& domain) override; - void GetAllRegions(const std::string& region_precision, - GetAllRegionsCallback callback) override; + void GetAllRegions(GetAllRegionsCallback callback) override; void GetTimezonesForRegions(ResponseCallback callback); void GetHostnamesForRegion(ResponseCallback callback, diff --git a/components/brave_vpn/common/mojom/brave_vpn.mojom b/components/brave_vpn/common/mojom/brave_vpn.mojom index 4c5f6f903fc..b9ba946f42c 100644 --- a/components/brave_vpn/common/mojom/brave_vpn.mojom +++ b/components/brave_vpn/common/mojom/brave_vpn.mojom @@ -51,7 +51,7 @@ interface ServiceHandler { Disconnect(); // Gets all region from internal cache which is fetched from Guardian API - GetAllRegions(string region_precision) => (array regions); + GetAllRegions() => (array regions); [EnableIfNot=is_android] GetSelectedRegion() => (Region current_region); diff --git a/components/brave_vpn/resources/panel/state/async.ts b/components/brave_vpn/resources/panel/state/async.ts index a09f9b8d529..b928186ff85 100644 --- a/components/brave_vpn/resources/panel/state/async.ts +++ b/components/brave_vpn/resources/panel/state/async.ts @@ -7,8 +7,7 @@ import { MiddlewareAPI, Dispatch, AnyAction } from 'redux' import AsyncActionHandler from '../../../../common/AsyncActionHandler' import getPanelBrowserAPI, { ConnectionState, - PurchasedState, - REGION_PRECISION_CITY_BY_COUNTRY + PurchasedState } from '../api/panel_browser_api' import * as Actions from './actions' import { RootState } from './store' @@ -60,9 +59,7 @@ handler.on(Actions.purchaseConfirmed.getType(), async (store) => { const [{ state }, { currentRegion }, { regions }] = await Promise.all([ getPanelBrowserAPI().serviceHandler.getConnectionState(), getPanelBrowserAPI().serviceHandler.getSelectedRegion(), - getPanelBrowserAPI().serviceHandler.getAllRegions( - REGION_PRECISION_CITY_BY_COUNTRY - ) + getPanelBrowserAPI().serviceHandler.getAllRegions() ]) store.dispatch( @@ -81,9 +78,7 @@ handler.on(Actions.purchaseConfirmed.getType(), async (store) => { handler.on(Actions.purchaseExpired.getType(), async (store) => { const [{ currentRegion }, { regions }] = await Promise.all([ getPanelBrowserAPI().serviceHandler.getSelectedRegion(), - getPanelBrowserAPI().serviceHandler.getAllRegions( - REGION_PRECISION_CITY_BY_COUNTRY - ) + getPanelBrowserAPI().serviceHandler.getAllRegions() ]) store.dispatch(