Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update hamburge menu for VPN (uplift to 1.72.x) #26024

Open
wants to merge 1 commit into
base: 1.72.x
Choose a base branch
from
+9 −8
Open

Update hamburge menu for VPN (uplift to 1.72.x) #26024

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Loading