From 7eff3936882a18af249182d5350d496d84b2a427 Mon Sep 17 00:00:00 2001 From: deeppandya Date: Mon, 12 Aug 2024 17:54:47 +0530 Subject: [PATCH] Remove native worker changes Update cpp changes and remove android exceptions --- .../chrome/browser/app/BraveActivity.java | 33 ++++++------ .../browser/vpn/BraveVpnNativeWorker.java | 26 --------- .../chrome/browser/vpn/BraveVpnObserver.java | 6 --- .../vpn/BraveVpnServiceFactoryAndroid.java | 6 --- .../vpn/activities/VpnServerActivity.java | 19 ------- .../browser/vpn/utils/BraveVpnUtils.java | 3 -- android/java/res/drawable/ic_carat_right.xml | 6 +++ .../java/res/layout/activity_vpn_server.xml | 8 +-- .../layout/activity_vpn_server_selection.xml | 8 +-- .../res/layout/vpn_server_item_layout.xml | 4 ++ .../android/brave_vpn_native_worker.cc | 38 ------------- .../android/brave_vpn_native_worker.h | 10 ---- .../brave_vpn_service_factory_android.cc | 2 - .../browser/api/brave_vpn_api_request.cc | 8 --- .../browser/api/brave_vpn_api_request.h | 1 - .../brave_vpn/browser/brave_vpn_service.cc | 54 +++++++------------ .../brave_vpn/browser/brave_vpn_service.h | 16 +++--- .../brave_vpn/common/mojom/brave_vpn.mojom | 2 + 18 files changed, 62 insertions(+), 188 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 1fabf1a68e9..c107626ae9c 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -195,7 +195,6 @@ import org.chromium.chrome.browser.vpn.BraveVpnNativeWorker; import org.chromium.chrome.browser.vpn.BraveVpnObserver; import org.chromium.chrome.browser.vpn.activities.BraveVpnProfileActivity; import org.chromium.chrome.browser.vpn.fragments.LinkVpnSubscriptionDialogFragment; -import org.chromium.chrome.browser.vpn.models.BraveVpnServerRegion; import org.chromium.chrome.browser.vpn.timer.TimerDialogFragment; import org.chromium.chrome.browser.vpn.utils.BraveVpnApiResponseUtils; import org.chromium.chrome.browser.vpn.utils.BraveVpnPrefUtils; @@ -1163,7 +1162,7 @@ public abstract class BraveActivity extends ChromeActivity if (!isFirstInstall && !BraveVpnPrefUtils.isIsoCodeUpgradeDone() && BraveVpnPrefUtils.isSubscriptionPurchase()) { - BraveVpnNativeWorker.getInstance().getAllServerRegions(); + // BraveVpnNativeWorker.getInstance().getAllServerRegions(); } if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_VPN_LINK_SUBSCRIPTION_ANDROID_UI) @@ -1345,21 +1344,21 @@ public abstract class BraveActivity extends ChromeActivity } } - @Override - public void onGetAllServerRegions(String jsonResponse, boolean isSuccess) { - if (isSuccess) { - List braveVpnServerRegions = - BraveVpnUtils.getServerLocations(jsonResponse); - for (BraveVpnServerRegion braveVpnServerRegion : braveVpnServerRegions) { - if (braveVpnServerRegion.getName().equals(BraveVpnPrefUtils.getServerRegion())) { - BraveVpnPrefUtils.setServerIsoCode(braveVpnServerRegion.getCountryIsoCode()); - BraveVpnPrefUtils.setServerNamePretty(braveVpnServerRegion.getNamePretty()); - BraveVpnPrefUtils.setIsoCodeUpgrade(true); - break; - } - } - } - } + // @Override + // public void onGetAllServerRegions(String jsonResponse, boolean isSuccess) { + // if (isSuccess) { + // List braveVpnServerRegions = + // BraveVpnUtils.getServerLocations(jsonResponse); + // for (BraveVpnServerRegion braveVpnServerRegion : braveVpnServerRegions) { + // if (braveVpnServerRegion.getName().equals(BraveVpnPrefUtils.getServerRegion())) { + // BraveVpnPrefUtils.setServerIsoCode(braveVpnServerRegion.getCountryIsoCode()); + // BraveVpnPrefUtils.setServerNamePretty(braveVpnServerRegion.getNamePretty()); + // BraveVpnPrefUtils.setIsoCodeUpgrade(true); + // break; + // } + // } + // } + // } private void handleDeepLinkVpn() { mIsDeepLink = true; diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java index 0de70b392ff..5452b518d90 100644 --- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnNativeWorker.java @@ -72,20 +72,6 @@ public class BraveVpnNativeWorker { mNativeBraveVpnNativeWorker = nativePtr; } - @CalledByNative - public void onGetAllServerRegions(String jsonServerRegions, boolean isSuccess) { - for (BraveVpnObserver observer : mObservers) { - observer.onGetAllServerRegions(jsonServerRegions, isSuccess); - } - } - - @CalledByNative - public void onGetServerRegionsWithCities(String jsonServerRegions, boolean isSuccess) { - for (BraveVpnObserver observer : mObservers) { - observer.onGetServerRegionsWithCities(jsonServerRegions, isSuccess); - } - } - @CalledByNative public void onGetTimezonesForRegions(String jsonTimezones, boolean isSuccess) { for (BraveVpnObserver observer : mObservers) { @@ -137,14 +123,6 @@ public class BraveVpnNativeWorker { } } - public void getAllServerRegions() { - BraveVpnNativeWorkerJni.get().getAllServerRegions(mNativeBraveVpnNativeWorker); - } - - public void getServerRegionsWithCities() { - BraveVpnNativeWorkerJni.get().getServerRegionsWithCities(mNativeBraveVpnNativeWorker); - } - public void getTimezonesForRegions() { BraveVpnNativeWorkerJni.get().getTimezonesForRegions(mNativeBraveVpnNativeWorker); } @@ -211,10 +189,6 @@ public class BraveVpnNativeWorker { void destroy(long nativeBraveVpnNativeWorker, BraveVpnNativeWorker caller); - void getAllServerRegions(long nativeBraveVpnNativeWorker); - - void getServerRegionsWithCities(long nativeBraveVpnNativeWorker); - void getTimezonesForRegions(long nativeBraveVpnNativeWorker); void getHostnamesForRegion(long nativeBraveVpnNativeWorker, String region); diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnObserver.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnObserver.java index 92967ce494c..4a7d76786a5 100644 --- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnObserver.java +++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnObserver.java @@ -6,12 +6,6 @@ package org.chromium.chrome.browser.vpn; public interface BraveVpnObserver { - public default void onGetAllServerRegions(String jsonServerRegions, boolean isSuccess) {} - ; - - public default void onGetServerRegionsWithCities(String jsonServerRegions, boolean isSuccess) {} - ; - public default void onGetTimezonesForRegions(String jsonTimezones, boolean isSuccess) {} ; diff --git a/android/java/org/chromium/chrome/browser/vpn/BraveVpnServiceFactoryAndroid.java b/android/java/org/chromium/chrome/browser/vpn/BraveVpnServiceFactoryAndroid.java index 2b78a7cadc8..9b50db0b8fa 100644 --- a/android/java/org/chromium/chrome/browser/vpn/BraveVpnServiceFactoryAndroid.java +++ b/android/java/org/chromium/chrome/browser/vpn/BraveVpnServiceFactoryAndroid.java @@ -8,7 +8,6 @@ package org.chromium.chrome.browser.vpn; import org.jni_zero.JNINamespace; import org.jni_zero.NativeMethods; -import org.chromium.base.Log; import org.chromium.brave_vpn.mojom.ServiceHandler; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.mojo.bindings.ConnectionErrorHandler; @@ -35,23 +34,18 @@ public class BraveVpnServiceFactoryAndroid { public ServiceHandler getVpnService( Profile profile, ConnectionErrorHandler connectionErrorHandler) { - Log.e("brave_vpn", "BraveVpnServiceFactoryAndroid : getVpnService 1"); if (profile == null) { return null; } - Log.e("brave_vpn", "BraveVpnServiceFactoryAndroid : getVpnService 2"); long nativeHandle = BraveVpnServiceFactoryAndroidJni.get().getInterfaceToVpnService(profile); - Log.e("brave_vpn", "BraveVpnServiceFactoryAndroid : getVpnService 2.5"); if (nativeHandle == -1) { return null; } - Log.e("brave_vpn", "BraveVpnServiceFactoryAndroid : getVpnService 3"); MessagePipeHandle handle = wrapNativeHandle(nativeHandle); ServiceHandler serviceHandler = ServiceHandler.MANAGER.attachProxy(handle, 0); Handler handler = ((Interface.Proxy) serviceHandler).getProxyHandler(); handler.setErrorHandler(connectionErrorHandler); - Log.e("brave_vpn", "BraveVpnServiceFactoryAndroid : getVpnService 4"); return serviceHandler; } diff --git a/android/java/org/chromium/chrome/browser/vpn/activities/VpnServerActivity.java b/android/java/org/chromium/chrome/browser/vpn/activities/VpnServerActivity.java index 1fe62bc60d5..b107878e42b 100644 --- a/android/java/org/chromium/chrome/browser/vpn/activities/VpnServerActivity.java +++ b/android/java/org/chromium/chrome/browser/vpn/activities/VpnServerActivity.java @@ -17,8 +17,6 @@ import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import com.google.android.material.radiobutton.MaterialRadioButton; - import org.chromium.brave_vpn.mojom.Region; import org.chromium.chrome.R; import org.chromium.chrome.browser.vpn.adapters.VpnServerAdapter; @@ -33,9 +31,6 @@ import java.util.List; public class VpnServerActivity extends BraveVpnParentActivity { private VpnServerAdapter mVpnServerAdapter; - private LinearLayout mOptimalLayout; - private MaterialRadioButton mOptimalServerRadioButton; - private LinearLayout mServerListLayout; private ProgressBar mServerProgress; private RecyclerView mServerRegionList; @@ -54,15 +49,6 @@ public class VpnServerActivity extends BraveVpnParentActivity { actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setTitle(getResources().getString(R.string.change_location)); - // mOptimalLayout = (LinearLayout) findViewById(R.id.optimal_region_layout); - // TextView optimalServerText = (TextView) mOptimalLayout.findViewById(R.id.server_text); - // optimalServerText.setText(getString(R.string.optimal_text)); - // TextView optimalCityServerText = (TextView) - // mOptimalLayout.findViewById(R.id.city_server_text); - // optimalCityServerText.setText(getString(R.string.optimal_desc)); - // mOptimalServerRadioButton = (MaterialRadioButton) - // mOptimalLayout.findViewById(R.id.server_radio_button); - mServerRegionList = (RecyclerView) findViewById(R.id.server_list); mServerListLayout = (LinearLayout) findViewById(R.id.server_layout); @@ -102,11 +88,6 @@ public class VpnServerActivity extends BraveVpnParentActivity { public void finishNativeInitialization() { super.finishNativeInitialization(); Region region = BraveVpnUtils.selectedRegion; - // if (getIntent() != null && getIntent().getExtras().getSerializable(BraveVpnUtils.REGION) - // != null) { - // region = (Region) getIntent().getExtras().getSerializable(BraveVpnUtils.REGION); - // } - // if (region != null && region.cities.length > 0) { showProgress(); List cities = new ArrayList(Arrays.asList(region.cities)); diff --git a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java index 69adc115c1f..58d00d8598b 100644 --- a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java +++ b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java @@ -130,9 +130,6 @@ public class BraveVpnUtils { return; } Intent vpnServerIntent = new Intent(activity, VpnServerActivity.class); - // Bundle bundle = new Bundle(); - // bundle.putSerializable(REGION, region); - // vpnServerIntent.putExtras(bundle); activity.startActivity(vpnServerIntent); } diff --git a/android/java/res/drawable/ic_carat_right.xml b/android/java/res/drawable/ic_carat_right.xml index 82f8845631c..303a0d191d8 100644 --- a/android/java/res/drawable/ic_carat_right.xml +++ b/android/java/res/drawable/ic_carat_right.xml @@ -1,3 +1,9 @@ + + + - - + - - + GetAllServerRegions( - base::BindOnce(&BraveVpnNativeWorker::OnGetAllServerRegions, - weak_factory_.GetWeakPtr())); - } -} - -void BraveVpnNativeWorker::OnGetAllServerRegions( - const std::string& server_regions_json, - bool success) { - JNIEnv* env = base::android::AttachCurrentThread(); - Java_BraveVpnNativeWorker_onGetAllServerRegions( - env, weak_java_brave_vpn_native_worker_.get(env), - base::android::ConvertUTF8ToJavaString(env, server_regions_json), - success); -} - -void BraveVpnNativeWorker::GetServerRegionsWithCities(JNIEnv* env) { - BraveVpnService* brave_vpn_service = GetBraveVpnService(); - if (brave_vpn_service) { - brave_vpn_service->GetServerRegionsWithCities( - base::BindOnce(&BraveVpnNativeWorker::OnGetServerRegionsWithCities, - weak_factory_.GetWeakPtr())); - } -} - -void BraveVpnNativeWorker::OnGetServerRegionsWithCities( - const std::string& server_regions_json, - bool success) { - JNIEnv* env = base::android::AttachCurrentThread(); - Java_BraveVpnNativeWorker_onGetServerRegionsWithCities( - env, weak_java_brave_vpn_native_worker_.get(env), - base::android::ConvertUTF8ToJavaString(env, server_regions_json), - success); -} - void BraveVpnNativeWorker::GetTimezonesForRegions(JNIEnv* env) { BraveVpnService* brave_vpn_service = GetBraveVpnService(); if (brave_vpn_service) { diff --git a/browser/brave_vpn/android/brave_vpn_native_worker.h b/browser/brave_vpn/android/brave_vpn_native_worker.h index 39785b47061..ce11fc34692 100644 --- a/browser/brave_vpn/android/brave_vpn_native_worker.h +++ b/browser/brave_vpn/android/brave_vpn_native_worker.h @@ -25,16 +25,6 @@ class BraveVpnNativeWorker { void Destroy(JNIEnv* env, const base::android::JavaParamRef& jcaller); - void GetAllServerRegions(JNIEnv* env); - - void OnGetAllServerRegions(const std::string& server_regions_json, - bool success); - - void GetServerRegionsWithCities(JNIEnv* env); - - void OnGetServerRegionsWithCities(const std::string& server_regions_json, - bool success); - void GetTimezonesForRegions(JNIEnv* env); void OnGetTimezonesForRegions(const std::string& timezones_json, diff --git a/browser/brave_vpn/android/brave_vpn_service_factory_android.cc b/browser/brave_vpn/android/brave_vpn_service_factory_android.cc index 7b5a6db0ed5..3b835abdafe 100644 --- a/browser/brave_vpn/android/brave_vpn_service_factory_android.cc +++ b/browser/brave_vpn/android/brave_vpn_service_factory_android.cc @@ -15,8 +15,6 @@ namespace android { static jlong JNI_BraveVpnServiceFactoryAndroid_GetInterfaceToVpnService( JNIEnv* env, const base::android::JavaParamRef& profile_android) { - LOG(ERROR) << "brave_vpn" - << "JNI_BraveVpnServiceFactoryAndroid_GetInterfaceToVpnService"; auto* profile = Profile::FromJavaObject(profile_android); if (profile == nullptr) { return static_cast(-1); diff --git a/components/brave_vpn/browser/api/brave_vpn_api_request.cc b/components/brave_vpn/browser/api/brave_vpn_api_request.cc index 59ca5630000..e4bad8be498 100644 --- a/components/brave_vpn/browser/api/brave_vpn_api_request.cc +++ b/components/brave_vpn/browser/api/brave_vpn_api_request.cc @@ -62,14 +62,6 @@ BraveVpnAPIRequest::BraveVpnAPIRequest( BraveVpnAPIRequest::~BraveVpnAPIRequest() = default; -void BraveVpnAPIRequest::GetAllServerRegions(ResponseCallback callback) { - auto internal_callback = - base::BindOnce(&BraveVpnAPIRequest::OnGetResponse, - weak_ptr_factory_.GetWeakPtr(), std::move(callback)); - GURL base_url = GetURLWithPath(kVpnHost, kAllServerRegions); - OAuthRequest(base_url, "GET", "", std::move(internal_callback)); -} - void BraveVpnAPIRequest::GetServerRegionsWithCities(ResponseCallback callback) { auto internal_callback = base::BindOnce(&BraveVpnAPIRequest::OnGetResponse, diff --git a/components/brave_vpn/browser/api/brave_vpn_api_request.h b/components/brave_vpn/browser/api/brave_vpn_api_request.h index a85414ea5ce..d9d3c00fe43 100644 --- a/components/brave_vpn/browser/api/brave_vpn_api_request.h +++ b/components/brave_vpn/browser/api/brave_vpn_api_request.h @@ -33,7 +33,6 @@ class BraveVpnAPIRequest { base::OnceCallback; using APIRequestResult = api_request_helper::APIRequestResult; - void GetAllServerRegions(ResponseCallback callback); void GetServerRegionsWithCities(ResponseCallback callback); void GetTimezonesForRegions(ResponseCallback callback); void GetHostnamesForRegion(ResponseCallback callback, diff --git a/components/brave_vpn/browser/brave_vpn_service.cc b/components/brave_vpn/browser/brave_vpn_service.cc index 65cefc9ce9b..b0685c61446 100644 --- a/components/brave_vpn/browser/brave_vpn_service.cc +++ b/components/brave_vpn/browser/brave_vpn_service.cc @@ -52,10 +52,9 @@ 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; - -#if !BUILDFLAG(IS_ANDROID) observed_.Observe(connection_manager_); policy_pref_change_registrar_.Init(profile_prefs_); policy_pref_change_registrar_.Add( @@ -247,6 +246,23 @@ void BraveVpnService::GetConnectionState(GetConnectionStateCallback callback) { std::move(callback).Run(state); } +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( @@ -363,8 +379,7 @@ void BraveVpnService::UpdatePurchasedStateForSessionExpired( #endif // !BUILDFLAG(IS_ANDROID) void BraveVpnService::GetAllRegions(GetAllRegionsCallback callback) { - // DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - LOG(ERROR) << "brave_vpn : " << "GetAllRegions"; + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); #if BUILDFLAG(IS_ANDROID) api_request_->GetServerRegionsWithCities( base::BindOnce(&BraveVpnService::OnFetchRegionList, @@ -379,14 +394,13 @@ void BraveVpnService::GetAllRegions(GetAllRegionsCallback callback) { #endif } +#if BUILDFLAG(IS_ANDROID) void BraveVpnService::OnFetchRegionList(GetAllRegionsCallback callback, const std::string& region_list, bool success) { std::optional value = base::JSONReader::Read(region_list); - LOG(ERROR) << "brave_vpn : " << "OnFetchRegionList 1"; if (value && value->is_list()) { auto new_regions = ParseRegionList(value->GetList()); - LOG(ERROR) << "brave_vpn : " << "OnFetchRegionList 2"; std::vector regions; for (const auto& region : new_regions) { regions.push_back(region.Clone()); @@ -395,26 +409,7 @@ void BraveVpnService::OnFetchRegionList(GetAllRegionsCallback callback, } } -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) { - LOG(ERROR) << "brave_vpn : " << "GetPurchaseToken"; std::string purchase_token_string = ""; std::string package_string = "com.brave.browser"; std::string product_id_string = "brave-firewall-vpn-premium"; @@ -468,7 +463,6 @@ mojom::PurchasedInfo BraveVpnService::GetPurchasedInfoSync() const { void BraveVpnService::GetPurchasedState(GetPurchasedStateCallback callback) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - LOG(ERROR) << "brave_vpn : " << "GetPurchasedState"; std::move(callback).Run(GetPurchasedInfoSync().Clone()); } @@ -893,14 +887,6 @@ void BraveVpnService::Shutdown() { #endif // !BUILDFLAG(IS_ANDROID) } -void BraveVpnService::GetAllServerRegions(ResponseCallback callback) { - api_request_->GetAllServerRegions(std::move(callback)); -} - -void BraveVpnService::GetServerRegionsWithCities(ResponseCallback callback) { - api_request_->GetServerRegionsWithCities(std::move(callback)); -} - void BraveVpnService::GetTimezonesForRegions(ResponseCallback callback) { api_request_->GetTimezonesForRegions(std::move(callback)); } diff --git a/components/brave_vpn/browser/brave_vpn_service.h b/components/brave_vpn/browser/brave_vpn_service.h index 5d3cbe8f955..09c1b9e3747 100644 --- a/components/brave_vpn/browser/brave_vpn_service.h +++ b/components/brave_vpn/browser/brave_vpn_service.h @@ -22,7 +22,6 @@ #include "brave/components/brave_vpn/browser/api/brave_vpn_api_request.h" #include "brave/components/brave_vpn/browser/brave_vpn_service_delegate.h" #include "brave/components/brave_vpn/browser/connection/brave_vpn_connection_manager.h" -#include "brave/components/brave_vpn/browser/connection/brave_vpn_region_data_manager.h" #include "brave/components/brave_vpn/common/brave_vpn_data_types.h" #include "brave/components/brave_vpn/common/mojom/brave_vpn.mojom.h" #include "brave/components/skus/browser/skus_utils.h" @@ -51,7 +50,6 @@ class BraveBrowserCommandControllerTest; namespace brave_vpn { class BraveVPNServiceDelegate; -class BraveVPNRegionDataManager; inline constexpr char kNewUserReturningHistogramName[] = "Brave.VPN.NewUserReturning"; @@ -101,6 +99,8 @@ class BraveVpnService : void GetConnectionState(GetConnectionStateCallback callback) override; void Connect() override; void Disconnect() 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, @@ -113,6 +113,9 @@ class BraveVpnService : #else // mojom::vpn::ServiceHandler void GetPurchaseToken(GetPurchaseTokenCallback callback) override; + void OnFetchRegionList(GetAllRegionsCallback callback, + const std::string& region_list, + bool success); #endif // !BUILDFLAG(IS_ANDROID) using ResponseCallback = @@ -125,13 +128,7 @@ class BraveVpnService : void LoadPurchasedState(const std::string& domain) override; void GetAllRegions(GetAllRegionsCallback callback) override; - void OnFetchRegionList(GetAllRegionsCallback callback, - const std::string& region_list, - bool success); - void GetSelectedRegion(GetSelectedRegionCallback callback) override; - void SetSelectedRegion(mojom::RegionPtr region) override; - void GetAllServerRegions(ResponseCallback callback); void GetServerRegionsWithCities(ResponseCallback callback); void GetTimezonesForRegions(ResponseCallback callback); void GetHostnamesForRegion(ResponseCallback callback, @@ -229,13 +226,12 @@ 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/common/mojom/brave_vpn.mojom b/components/brave_vpn/common/mojom/brave_vpn.mojom index b1cb5ecd628..0706f7a8fb6 100644 --- a/components/brave_vpn/common/mojom/brave_vpn.mojom +++ b/components/brave_vpn/common/mojom/brave_vpn.mojom @@ -53,8 +53,10 @@ interface ServiceHandler { // Gets all region from internal cache which is fetched from Guardian API GetAllRegions() => (array regions); + [EnableIfNot=is_android] GetSelectedRegion() => (Region current_region); + [EnableIfNot=is_android] SetSelectedRegion(Region region); [EnableIfNot=is_android]