From f85ed2d4e2e75592ff9b25cfa7af601a0bfa69be Mon Sep 17 00:00:00 2001 From: deeppandya Date: Wed, 21 Aug 2024 23:19:37 +0530 Subject: [PATCH] Remove iso code upgrade path as it's not required Resolve desktop unittests --- .../chrome/browser/app/BraveActivity.java | 21 ------------------- .../browser/vpn/utils/BraveVpnPrefUtils.java | 9 -------- .../browser/brave_vpn_service_unittest.cc | 3 ++- .../system_vpn_connection_api_unittest.cc | 2 +- .../brave_vpn/resources/panel/state/async.ts | 5 +++-- 5 files changed, 6 insertions(+), 34 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index c107626ae9c..7d77a266c52 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -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 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); diff --git a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java index c905e6daefa..166dba77e71 100644 --- a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java +++ b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnPrefUtils.java @@ -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() diff --git a/components/brave_vpn/browser/brave_vpn_service_unittest.cc b/components/brave_vpn/browser/brave_vpn_service_unittest.cc index 8bbaddb2b6a..b91e2ffd7db 100644 --- a/components/brave_vpn/browser/brave_vpn_service_unittest.cc +++ b/components/brave_vpn/browser/brave_vpn_service_unittest.cc @@ -23,6 +23,7 @@ #include "brave/components/brave_vpn/browser/brave_vpn_service_helper.h" #include "brave/components/brave_vpn/browser/connection/brave_vpn_connection_info.h" #include "brave/components/brave_vpn/browser/connection/brave_vpn_connection_manager.h" +#include "brave/components/brave_vpn/browser/connection/brave_vpn_region_data_helper.h" #include "brave/components/brave_vpn/common/brave_vpn_constants.h" #include "brave/components/brave_vpn/common/brave_vpn_utils.h" #include "brave/components/brave_vpn/common/features.h" @@ -303,7 +304,7 @@ class BraveVPNServiceTest : public testing::Test { ->GetRegionDataManager() .GetDeviceRegion(), regions())) { - return *region_ptr; + return std::move(*region_ptr); } return mojom::Region(); } diff --git a/components/brave_vpn/browser/connection/ikev2/system_vpn_connection_api_unittest.cc b/components/brave_vpn/browser/connection/ikev2/system_vpn_connection_api_unittest.cc index c2385c5dc3b..52cc4fd6fc1 100644 --- a/components/brave_vpn/browser/connection/ikev2/system_vpn_connection_api_unittest.cc +++ b/components/brave_vpn/browser/connection/ikev2/system_vpn_connection_api_unittest.cc @@ -244,7 +244,7 @@ class SystemVPNConnectionAPIUnitTest : public testing::Test { ->GetRegionDataManager() .GetDeviceRegion(), regions())) { - return *region_ptr; + return std::move(*region_ptr); } return mojom::Region(); } diff --git a/components/brave_vpn/resources/panel/state/async.ts b/components/brave_vpn/resources/panel/state/async.ts index cc7e9a521b5..e800942128d 100644 --- a/components/brave_vpn/resources/panel/state/async.ts +++ b/components/brave_vpn/resources/panel/state/async.ts @@ -8,6 +8,7 @@ import AsyncActionHandler from '../../../../common/AsyncActionHandler' import getPanelBrowserAPI, { ConnectionState, PurchasedState } from '../api/panel_browser_api' import * as Actions from './actions' import { RootState } from './store' +import { REGION_PRECISION_CITY_BY_COUNTRY } from '../../api/panel_browser_api' const handler = new AsyncActionHandler() type Store = MiddlewareAPI, any> @@ -50,7 +51,7 @@ handler.on(Actions.purchaseConfirmed.getType(), async (store) => { const [{ state }, { currentRegion }, { regions }] = await Promise.all([ getPanelBrowserAPI().serviceHandler.getConnectionState(), getPanelBrowserAPI().serviceHandler.getSelectedRegion(), - getPanelBrowserAPI().serviceHandler.getAllRegions("city-by-country") + getPanelBrowserAPI().serviceHandler.getAllRegions(REGION_PRECISION_CITY_BY_COUNTRY) ]) store.dispatch(Actions.showMainView({ @@ -65,7 +66,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("city-by-country") + getPanelBrowserAPI().serviceHandler.getAllRegions(REGION_PRECISION_CITY_BY_COUNTRY) ]) store.dispatch(Actions.showMainView({