Merge pull request #26178 from brave/resolve_vpn_settings_crash

Resolve vpn settings crash
brave · Oct 24, 2024 · 7da094e · 7da094e
2 parents 833b5a6 + 4dfd429
commit 7da094e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/android/java/org/chromium/chrome/browser/vpn/settings/BraveVpnPreferences.java b/android/java/org/chromium/chrome/browser/vpn/settings/BraveVpnPreferences.java
@@ -311,7 +311,7 @@ public void run() {
                                         @Override
                                         public void run() {
                                             findPreference(PREF_SERVER_CHANGE_LOCATION)
-                                                    .setEnabled(
+                                                    .setVisible(
                                                             BraveVpnPrefUtils
                                                                     .isSubscriptionPurchase());
                                             findPreference(PREF_SPLIT_TUNNELING)

diff --git a/android/java/org/chromium/chrome/browser/vpn/settings/VpnRegionPreference.java b/android/java/org/chromium/chrome/browser/vpn/settings/VpnRegionPreference.java
@@ -31,7 +31,10 @@ public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
         TextView regionFlag = (TextView) holder.findViewById(R.id.region_flag);
-        regionFlag.setText(BraveVpnUtils.countryCodeToEmoji(BraveVpnPrefUtils.getRegionIsoCode()));
+        if (!BraveVpnPrefUtils.getRegionIsoCode().isEmpty()) {
+            regionFlag.setText(
+                    BraveVpnUtils.countryCodeToEmoji(BraveVpnPrefUtils.getRegionIsoCode()));
+        }
 
         String serverLocationTitle = BraveVpnPrefUtils.getRegionCountry();
         String serverLocationSummary =