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

Remove iso code upgrade path as it's not required

Browse Source 
Resolve desktop unittests
This commit is contained in:
deeppandya
2024-09-06 03:22:54 +05:30
parent 59a9881828
commit f85ed2d4e2
5 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/app/BraveActivity.java
-21
View File
@@ -1159,11 +1159,6 @@ public abstract class BraveActivity extends ChromeActivity
checkFingerPrintingOnUpgrade(isFirstInstall);
checkForVpnCallout(isFirstInstall);
if (!isFirstInstall
&& !BraveVpnPrefUtils.isIsoCodeUpgradeDone()
&& BraveVpnPrefUtils.isSubscriptionPurchase()) {
// BraveVpnNativeWorker.getInstance().getAllServerRegions();
}
if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_VPN_LINK_SUBSCRIPTION_ANDROID_UI)
&& BraveVpnPrefUtils.isSubscriptionPurchase()
@@ -1344,22 +1339,6 @@ public abstract class BraveActivity extends ChromeActivity
}
}
// @Override
// public void onGetAllServerRegions(String jsonResponse, boolean isSuccess) {
// if (isSuccess) {
// List<BraveVpnServerRegion> 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;
BraveVpnUtils.openBraveVpnPlansActivity(this);
android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java
-9
View File
@@ -53,15 +53,6 @@ public class BraveVpnPrefUtils {
public static final String PREF_SESSION_START_TIME = "brave_vpn_session_start_time";
public static final String PREF_SESSION_END_TIME = "brave_vpn_session_end_time";
private static final String PREF_LINK_SUBSCRIPTION_DIALOG = "link_subscription_dialog";
private static final String PREF_VPN_ISO_CODE_UPGRADE = "vpn_iso_code_upgrade";
public static boolean isIsoCodeUpgradeDone() {
return ChromeSharedPreferences.getInstance().readBoolean(PREF_VPN_ISO_CODE_UPGRADE, false);
}
public static void setIsoCodeUpgrade(boolean newValue) {
ChromeSharedPreferences.getInstance().writeBoolean(PREF_VPN_ISO_CODE_UPGRADE, newValue);
}
public static boolean isLinkSubscriptionDialogShown() {
return ChromeSharedPreferences.getInstance()