Uplift of #26238 (squashed) to beta

brave · Oct 25, 2024 · 7d117b8 · 7d117b8
1 parent c446320
commit 7d117b8
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/android/java/org/chromium/chrome/browser/vpn/settings/VpnRegionPreference.java b/android/java/org/chromium/chrome/browser/vpn/settings/VpnRegionPreference.java
@@ -37,11 +37,15 @@ public void onBindViewHolder(PreferenceViewHolder holder) {
         }
 
         String serverLocationTitle = BraveVpnPrefUtils.getRegionCountry();
+        String optimalString = "%s - %s";
         String serverLocationSummary =
                 BraveVpnPrefUtils.getRegionPrecision()
                                 .equals(BraveVpnConstants.REGION_PRECISION_COUNTRY)
-                        ? mContext.getString(R.string.optimal_text)
-                        : BraveVpnPrefUtils.getRegionNamePretty();
+                        ? String.format(
+                                optimalString,
+                                mContext.getString(R.string.optimal_text),
+                                BraveVpnPrefUtils.getHostnameDisplay())
+                        : BraveVpnPrefUtils.getHostnameDisplay();
 
         TextView regionTitle = (TextView) holder.findViewById(R.id.region_title);
         regionTitle.setText(serverLocationTitle);