Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add region precision in the api

Browse Source
This commit is contained in:
deeppandya
2024-09-06 03:22:34 +05:30
parent 7eff393688
commit 9a6b1ba3b9
9 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/vpn/activities/VpnServerSelectionActivity.java
+2
View File
@@ -19,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.materialswitch.MaterialSwitch;
import org.chromium.brave_vpn.mojom.BraveVpnConstants;
import org.chromium.brave_vpn.mojom.Region;
import org.chromium.brave_vpn.mojom.ServiceHandler;
import org.chromium.chrome.R;
@@ -132,6 +133,7 @@ public class VpnServerSelectionActivity extends BraveVpnParentActivity
initVpnService();
showProgress();
mServiceHandler.getAllRegions(
BraveVpnConstants.REGION_PRECISION_CITY_BY_COUNTRY,
regions -> {
if (regions.length > 0) {
mBraveVpnServerSelectionAdapter =
components/brave_vpn/browser/api/brave_vpn_api_request.cc
+4 -2
View File
@@ -62,11 +62,13 @@ BraveVpnAPIRequest::BraveVpnAPIRequest(
BraveVpnAPIRequest::~BraveVpnAPIRequest() = default;
void BraveVpnAPIRequest::GetServerRegionsWithCities(ResponseCallback callback) {
void BraveVpnAPIRequest::GetServerRegions(ResponseCallback callback,
const std::string& region_precision) {
auto internal_callback =
base::BindOnce(&BraveVpnAPIRequest::OnGetResponse,
weak_ptr_factory_.GetWeakPtr(), std::move(callback));
GURL base_url = GetURLWithPath(kVpnHost, kServerRegionsWithCities);
GURL base_url =
GetURLWithPath(kVpnHost, kServerRegionsWithCities + region_precision);
OAuthRequest(base_url, "GET", "", std::move(internal_callback));
}
components/brave_vpn/browser/api/brave_vpn_api_request.h
+2 -1
View File
@@ -33,7 +33,8 @@ class BraveVpnAPIRequest {
base::OnceCallback<void(const std::string&, bool success)>;
using APIRequestResult = api_request_helper::APIRequestResult;
void GetServerRegionsWithCities(ResponseCallback callback);
void GetServerRegions(ResponseCallback callback,
const std::string& region_precision);
void GetTimezonesForRegions(ResponseCallback callback);
void GetHostnamesForRegion(ResponseCallback callback,
const std::string& region);
components/brave_vpn/browser/brave_vpn_service.cc
+5 -3
View File
@@ -378,12 +378,14 @@ void BraveVpnService::UpdatePurchasedStateForSessionExpired(
}
#endif // !BUILDFLAG(IS_ANDROID)
void BraveVpnService::GetAllRegions(GetAllRegionsCallback callback) {
void BraveVpnService::GetAllRegions(const std::string& region_precision,
GetAllRegionsCallback callback) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
#if BUILDFLAG(IS_ANDROID)
api_request_->GetServerRegionsWithCities(
api_request_->GetServerRegions(
base::BindOnce(&BraveVpnService::OnFetchRegionList,
base::Unretained(this), std::move(callback)));
base::Unretained(this), std::move(callback)),
region_precision);
#else
std::vector<mojom::RegionPtr> regions;
for (const auto& region :
components/brave_vpn/browser/brave_vpn_service.h
+2 -2
View File
@@ -127,9 +127,9 @@ class BraveVpnService :
void GetPurchasedState(GetPurchasedStateCallback callback) override;
void LoadPurchasedState(const std::string& domain) override;
void GetAllRegions(GetAllRegionsCallback callback) override;
void GetAllRegions(const std::string& region_precision,
GetAllRegionsCallback callback) override;
void GetServerRegionsWithCities(ResponseCallback callback);
void GetTimezonesForRegions(ResponseCallback callback);
void GetHostnamesForRegion(ResponseCallback callback,
const std::string& region);
components/brave_vpn/browser/brave_vpn_service_helper.cc
+11 -7
View File
@@ -50,11 +50,13 @@ base::Value::Dict GetValueFromRegionWithoutCity(
base::Value::Dict GetValueFromRegion(const mojom::RegionPtr& region) {
base::Value::Dict region_dict = GetValueFromRegionWithoutCity(region);
base::Value::List cities;
for (const auto& city : region->cities) {
cities.Append(GetValueFromRegionWithoutCity(city));
if (!region->cities.empty()) {
base::Value::List cities;
for (const auto& city : region->cities) {
cities.Append(GetValueFromRegionWithoutCity(city));
}
region_dict.Set(kRegionCitiesKey, std::move(cities));
}
region_dict.Set(kRegionCitiesKey, std::move(cities));
return region_dict;
}
@@ -108,9 +110,11 @@ mojom::RegionPtr GetRegionFromValueWithoutCity(const base::Value::Dict& value) {
mojom::RegionPtr GetRegionFromValue(const base::Value::Dict& value) {
mojom::RegionPtr region = GetRegionFromValueWithoutCity(value);
const auto* cities = value.FindList(kRegionCitiesKey);
for (const auto& city : *cities) {
region->cities.push_back(GetRegionFromValueWithoutCity(city.GetDict()));
if (value.FindList(kRegionCitiesKey)) {
const auto* cities = value.FindList(kRegionCitiesKey);
for (const auto& city : *cities) {
region->cities.push_back(GetRegionFromValueWithoutCity(city.GetDict()));
}
}
return region;
components/brave_vpn/browser/connection/brave_vpn_region_data_manager.cc
+4 -19
View File
@@ -190,16 +190,13 @@ void BraveVPNRegionDataManager::FetchRegionDataIfNeeded() {
}
void BraveVPNRegionDataManager::FetchRegions() {
LOG(ERROR) << "brave_vpn : " << "FetchRegions 1";
if (!url_loader_factory_) {
LOG(ERROR) << "brave_vpn : " << "FetchRegions 1.5";
}
api_request_ = std::make_unique<BraveVpnAPIRequest>(url_loader_factory_);
VLOG(2) << __func__ << " : Start fetching region data";
LOG(ERROR) << "brave_vpn : " << "FetchRegions 2";
// Unretained is safe here becasue this class owns |api_request_|.
api_request_->GetServerRegionsWithCities(base::BindOnce(
&BraveVPNRegionDataManager::OnFetchRegionList, base::Unretained(this)));
api_request_->GetServerRegions(
base::BindOnce(&BraveVPNRegionDataManager::OnFetchRegionList,
base::Unretained(this)),
mojom::kRegionPrecisionCityByCountry);
}
void BraveVPNRegionDataManager::OnFetchRegionList(
@@ -210,17 +207,6 @@ void BraveVPNRegionDataManager::OnFetchRegionList(
}
api_request_.reset();
std::optional<base::Value> value = base::JSONReader::Read(region_list);
LOG(ERROR) << "brave_vpn : " << "OnFetchRegionList 1";
#if BUILDFLAG(IS_ANDROID)
if (value && value->is_list()) {
auto new_regions = ParseRegionList(value->GetList());
LOG(ERROR) << "brave_vpn : " << "OnFetchRegionList 2";
for (const auto& region : new_regions) {
LOG(ERROR) << "brave_vpn : " << region->name;
}
}
#else
if (value && value->is_list() &&
ParseAndCacheRegionList(value->GetList(), true)) {
VLOG(2) << "Got valid region list";
@@ -236,7 +222,6 @@ void BraveVPNRegionDataManager::OnFetchRegionList(
VLOG(2) << "Got invalid region list";
NotifyRegionDataReady();
#endif
}
bool BraveVPNRegionDataManager::ParseAndCacheRegionList(
components/brave_vpn/common/brave_vpn_constants.h
+1 -1
View File
@@ -41,7 +41,7 @@ inline constexpr char kSupportTicketTimezoneKey[] = "timezone";
inline constexpr char kVpnHost[] = "connect-api.guardianapp.com";
inline constexpr char kAllServerRegions[] = "api/v1/servers/all-server-regions";
inline constexpr char kServerRegionsWithCities[] =
"api/v1.3/servers/all-server-regions/city-by-country";
"api/v1.3/servers/all-server-regions/";
inline constexpr char kTimezonesForRegions[] =
"api/v1.1/servers/timezones-for-regions";
inline constexpr char kHostnameForRegion[] =
components/brave_vpn/common/mojom/brave_vpn.mojom
+6 -1
View File
@@ -51,7 +51,7 @@ interface ServiceHandler {
Disconnect();
// Gets all region from internal cache which is fetched from Guardian API
GetAllRegions() => (array<Region> regions);
GetAllRegions(string region_precision) => (array<Region> regions);
[EnableIfNot=is_android]
GetSelectedRegion() => (Region current_region);
@@ -132,3 +132,8 @@ struct Region {
double longitude;
int32 server_count;
};
const string kRegionPrecisionDefault = "default";
const string kRegionPrecisionCity = "city";
const string kRegionPrecisionCountry = "country";
const string kRegionPrecisionCityByCountry = "city-by-country";