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

Remove cityname and cityname pretty and rely on region name only

Browse Source
This commit is contained in:
deeppandya
2024-09-19 01:07:41 +05:30
parent 167916dd25
commit 5141e9f403
7 changed files with 45 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/vpn/activities/VpnServerActivity.java
+3 -5
View File
@@ -105,7 +105,7 @@ public class VpnServerActivity extends BraveVpnParentActivity {
new OnCitySelection() {
@Override
public void onCityClick(Region city, int position) {
if (BraveVpnPrefUtils.getRegionCityName().equals(city.name)) {
if (BraveVpnPrefUtils.getRegionName().equals(city.name)) {
Toast.makeText(
VpnServerActivity.this,
R.string.already_selected_the_server,
@@ -115,12 +115,10 @@ public class VpnServerActivity extends BraveVpnParentActivity {
BraveVpnUtils.selectedServerRegion =
new BraveVpnServerRegion(
region.countryIsoCode,
region.name,
region.namePretty,
position == 0
? BraveVpnUtils.OPTIMAL_SERVER
? BraveVpnPrefUtils.PREF_BRAVE_VPN_AUTOMATIC
: city.name,
city.namePretty,
position == 0 ? region.namePretty : city.namePretty,
position == 0
? BraveVpnConstants.REGION_PRECISION_COUNTRY
: BraveVpnConstants.REGION_PRECISION_CITY);
android/java/org/chromium/chrome/browser/vpn/activities/VpnServerSelectionActivity.java
-2
View File
@@ -101,8 +101,6 @@ public class VpnServerSelectionActivity extends BraveVpnParentActivity
"",
BraveVpnPrefUtils.PREF_BRAVE_VPN_AUTOMATIC,
"",
BraveVpnUtils.OPTIMAL_SERVER,
"",
BraveVpnConstants.REGION_PRECISION_COUNTRY);
changeServerRegion();
}
android/java/org/chromium/chrome/browser/vpn/adapters/VpnServerAdapter.java
+32 -7
View File
@@ -17,11 +17,11 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.radiobutton.MaterialRadioButton;
import org.chromium.brave_vpn.mojom.BraveVpnConstants;
import org.chromium.brave_vpn.mojom.Region;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.vpn.activities.VpnServerActivity.OnCitySelection;
import org.chromium.chrome.browser.vpn.utils.BraveVpnPrefUtils;
import org.chromium.chrome.browser.vpn.utils.BraveVpnUtils;
import java.util.ArrayList;
import java.util.List;
@@ -54,13 +54,38 @@ public class VpnServerAdapter extends RecyclerView.Adapter<VpnServerAdapter.View
.getQuantityString(
R.plurals.server_text, city.serverCount, city.serverCount);
holder.cityServerText.setText((position == 0) ? city.name : cityServerText);
// boolean isEnabled =
// BraveVpnPrefUtils.getRegionName().equals(mRegion.name)
// && BraveVpnPrefUtils.getRegionName()
// .equals(
// position == 0
// ? BraveVpnUtils.OPTIMAL_SERVER
// : city.name);
// boolean isEnabled =
// BraveVpnPrefUtils.getRegionPrecision()
// .equals(BraveVpnConstants.REGION_PRECISION_CITY)
// && BraveVpnPrefUtils.getRegionName()
// .equals(
// position == 0
// ? BraveVpnPrefUtils.PREF_BRAVE_VPN_AUTOMATIC
// : city.name);
// boolean isEnabled =
// (BraveVpnPrefUtils.getRegionPrecision().equals(BraveVpnConstants.REGION_PRECISION_COUNTRY) && BraveVpnPrefUtils.getRegionName().equals(mRegion.name) && position == 0) || (BraveVpnPrefUtils.getRegionPrecision().equals(BraveVpnConstants.REGION_PRECISION_CITY) && BraveVpnPrefUtils.getRegionName().equals(city.name));
boolean isCountryPrecision =
BraveVpnPrefUtils.getRegionPrecision()
.equals(BraveVpnConstants.REGION_PRECISION_COUNTRY);
boolean isCityPrecision =
BraveVpnPrefUtils.getRegionPrecision()
.equals(BraveVpnConstants.REGION_PRECISION_CITY);
boolean isRegionMatch =
BraveVpnPrefUtils.getRegionName().equals(mRegion.name) && position == 0;
boolean isCityMatch = BraveVpnPrefUtils.getRegionName().equals(city.name);
boolean isEnabled =
BraveVpnPrefUtils.getRegionName().equals(mRegion.name)
&& BraveVpnPrefUtils.getRegionCityName()
.equals(
position == 0
? BraveVpnUtils.OPTIMAL_SERVER
: city.name);
(isCountryPrecision && isRegionMatch) || (isCityPrecision && isCityMatch);
holder.serverRadioButton.setChecked(isEnabled);
holder.serverSelectionItemLayout.setOnClickListener(
new View.OnClickListener() {
android/java/org/chromium/chrome/browser/vpn/models/BraveVpnServerRegion.java
-21
View File
@@ -11,22 +11,16 @@ public class BraveVpnServerRegion {
private String mCountryIsoCode;
private String mRegionName;
private String mRegionNamePretty;
private String mRegionCityName;
private String mRegionCityNamePretty;
private String mRegionPrecision;
public BraveVpnServerRegion(
String countryIsoCode,
String regionName,
String regionNamePretty,
String regionCityName,
String regionCityNamePretty,
String regionPrecision) {
this.mCountryIsoCode = countryIsoCode;
this.mRegionName = regionName;
this.mRegionNamePretty = regionNamePretty;
this.mRegionCityName = regionCityName;
this.mRegionCityNamePretty = regionCityNamePretty;
this.mRegionPrecision = regionPrecision;
}
@@ -42,14 +36,6 @@ public class BraveVpnServerRegion {
return mRegionNamePretty;
}
public String getRegionCityName() {
return mRegionCityName;
}
public String getRegionCityNamePretty() {
return mRegionCityNamePretty;
}
public String getRegionPrecision() {
return mRegionPrecision;
}
@@ -67,13 +53,6 @@ public class BraveVpnServerRegion {
+ ", mRegionNamePretty='"
+ mRegionNamePretty
+ '\''
+ ", mRegionCityName='"
+ mRegionCityName
+ '\''
+ ", mRegionCityNamePretty='"
+ mRegionCityNamePretty
+ '\''
+ '\''
+ ", mRegionPrecision='"
+ mRegionPrecision
+ '\''
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnApiResponseUtils.java
+6 -7
View File
@@ -14,7 +14,6 @@ import android.util.Pair;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import org.chromium.brave_vpn.mojom.BraveVpnConstants;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.billing.InAppPurchaseWrapper;
import org.chromium.chrome.browser.billing.PurchaseModel;
@@ -89,12 +88,12 @@ public class BraveVpnApiResponseUtils {
? region
: serverRegion;
}
region =
(braveVpnServerRegion
.getRegionPrecision()
.equals(BraveVpnConstants.REGION_PRECISION_CITY)
? braveVpnServerRegion.getRegionCityName()
: region);
// region =
// (braveVpnServerRegion
// .getRegionPrecision()
// .equals(BraveVpnConstants.REGION_PRECISION_CITY)
// ? braveVpnServerRegion.getRegionCityName()
// : region);
BraveVpnNativeWorker.getInstance()
.getHostnamesForRegion(region, braveVpnServerRegion.getRegionPrecision());
braveVpnPrefModel.setServerRegion(braveVpnServerRegion);
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java
+4 -26
View File
@@ -7,8 +7,8 @@
package org.chromium.chrome.browser.vpn.utils;
import org.chromium.base.ContextUtils;
import org.chromium.brave_vpn.mojom.BraveVpnConstants;
import org.chromium.chrome.browser.preferences.BravePref;
import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
import org.chromium.chrome.browser.profiles.ProfileManager;
@@ -32,8 +32,6 @@ public class BraveVpnPrefUtils {
private static final String PREF_BRAVE_VPN_SERVER_CHANGE_LOCATION = "server_change_location";
private static final String PREF_BRAVE_VPN_SERVER_ISO_CODE = "server_iso_code";
private static final String PREF_BRAVE_VPN_SERVER_NAME_PRETTY = "server_name_pretty";
private static final String PREF_BRAVE_VPN_SERVER_CITY_NAME = "server_city_name";
private static final String PREF_BRAVE_VPN_SERVER_CITY_NAME_PRETTY = "server_city_name_pretty";
private static final String PREF_BRAVE_VPN_SERVER_PRECISION = "server_precision";
private static final String VPN_AUTOMATIC_SERVER_SELECTION = "vpn_automatic_server_selection";
@@ -190,29 +188,11 @@ public class BraveVpnPrefUtils {
.writeString(PREF_BRAVE_VPN_SERVER_NAME_PRETTY, newValue);
}
public static String getRegionCityName() {
return ChromeSharedPreferences.getInstance()
.readString(PREF_BRAVE_VPN_SERVER_CITY_NAME, "");
}
public static void setRegionCityName(String newValue) {
ChromeSharedPreferences.getInstance()
.writeString(PREF_BRAVE_VPN_SERVER_CITY_NAME, newValue);
}
public static String getRegionCityNamePretty() {
return ChromeSharedPreferences.getInstance()
.readString(PREF_BRAVE_VPN_SERVER_CITY_NAME_PRETTY, "");
}
public static void setRegionCityNamePretty(String newValue) {
ChromeSharedPreferences.getInstance()
.writeString(PREF_BRAVE_VPN_SERVER_CITY_NAME_PRETTY, newValue);
}
public static String getRegionPrecision() {
return ChromeSharedPreferences.getInstance()
.readString(PREF_BRAVE_VPN_SERVER_PRECISION, "");
.readString(
PREF_BRAVE_VPN_SERVER_PRECISION,
BraveVpnConstants.REGION_PRECISION_COUNTRY);
}
public static void setRegionPrecision(String newValue) {
@@ -278,8 +258,6 @@ public class BraveVpnPrefUtils {
setRegionIsoCode(braveVpnPrefModel.getServerRegion().getCountryIsoCode());
setRegionName(braveVpnPrefModel.getServerRegion().getRegionName());
setRegionNamePretty(braveVpnPrefModel.getServerRegion().getRegionNamePretty());
setRegionCityName(braveVpnPrefModel.getServerRegion().getRegionCityName());
setRegionCityNamePretty(braveVpnPrefModel.getServerRegion().getRegionCityNamePretty());
setRegionPrecision(braveVpnPrefModel.getServerRegion().getRegionPrecision());
setPurchaseToken(braveVpnPrefModel.getPurchaseToken());
setProductId(braveVpnPrefModel.getProductId());
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnUtils.java
-4
View File
@@ -52,8 +52,6 @@ public class BraveVpnUtils {
public static final String VERIFY_CREDENTIALS_FAILED = "verify_credentials_failed";
public static final String DESKTOP_CREDENTIAL = "desktop_credential";
public static final String OPTIMAL_SERVER = "Optimal";
public static boolean mUpdateProfileAfterSplitTunnel;
public static BraveVpnServerRegion selectedServerRegion;
public static Region selectedRegion;
@@ -162,8 +160,6 @@ public class BraveVpnUtils {
region.getString("country-iso-code"),
region.getString("name"),
region.getString("name-pretty"),
OPTIMAL_SERVER,
"",
BraveVpnConstants.REGION_PRECISION_COUNTRY);
return braveVpnServerRegion;
}