From 8ad5c82a017f515abeda88dc901a0562a39c8383 Mon Sep 17 00:00:00 2001
From: brave-builds <brave-builds+devops@brave.com>
Date: Tue, 15 Oct 2024 23:11:27 +0000
Subject: [PATCH] Uplift of #26005 (squashed) to beta

---
 .../BraveTabbedAppMenuPropertiesDelegate.java   | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
index 221f2f0a303e..b5ab465dc1dc 100644
--- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
+++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
@@ -24,6 +24,7 @@
 import org.chromium.base.supplier.ObservableSupplier;
 import org.chromium.base.supplier.OneshotSupplier;
 import org.chromium.base.supplier.Supplier;
+import org.chromium.brave_vpn.mojom.BraveVpnConstants;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.BraveRewardsNativeWorker;
@@ -58,8 +59,6 @@
 import org.chromium.components.user_prefs.UserPrefs;
 import org.chromium.ui.modaldialog.ModalDialogManager;
 
-import java.util.Locale;
-
 /** Brave's extension for TabbedAppMenuPropertiesDelegate */
 public class BraveTabbedAppMenuPropertiesDelegate extends TabbedAppMenuPropertiesDelegate {
     private Menu mMenu;
@@ -126,23 +125,25 @@ public void prepareMenu(Menu menu, AppMenuHandler handler) {
 
             if (BraveVpnPrefUtils.isSubscriptionPurchase()
                     && !TextUtils.isEmpty(BraveVpnPrefUtils.getRegionIsoCode())) {
-                String serverLocation = " %s  %s";
+                String serverLocation = " %s  %s - %s";
                 SubMenu vpnLocationSubMenu =
                         menu.findItem(R.id.request_vpn_location_row_menu_id).getSubMenu();
                 MenuItem vpnLocationSubMenuItem =
                         vpnLocationSubMenu.findItem(R.id.request_vpn_location_id);
                 String isoCode = BraveVpnPrefUtils.getRegionIsoCode();
-                String country =
-                        !BraveVpnPrefUtils.getRegionCountry().equals("")
-                                ? BraveVpnPrefUtils.getRegionCountry()
-                                : new Locale("", isoCode).getDisplayCountry();
+                String regionName =
+                        BraveVpnPrefUtils.getRegionPrecision()
+                                        .equals(BraveVpnConstants.REGION_PRECISION_COUNTRY)
+                                ? mContext.getString(R.string.optimal_text)
+                                : BraveVpnPrefUtils.getRegionNamePretty();
 
                 vpnLocationSubMenuItem.setTitle(
                         String.format(
                                 serverLocation,
                                 BraveVpnUtils.countryCodeToEmoji(
                                         BraveVpnPrefUtils.getRegionIsoCode()),
-                                country));
+                                BraveVpnPrefUtils.getRegionIsoCode(),
+                                regionName));
                 MenuItem vpnLocationIconSubMenuItem =
                         vpnLocationSubMenu.findItem(R.id.request_vpn_location_icon_id);
                 Drawable drawable = vpnLocationIconSubMenuItem.getIcon();