From 4dfd42923c8d86e5d93b28be4ee3ead12289ab09 Mon Sep 17 00:00:00 2001
From: deeppandya <deeppandya91@gmail.com>
Date: Wed, 23 Oct 2024 16:11:31 -0400
Subject: [PATCH] Resolve vpn settings crash

Resolve format error
---
 .../chrome/browser/vpn/settings/BraveVpnPreferences.java     | 2 +-
 .../chrome/browser/vpn/settings/VpnRegionPreference.java     | 5 ++++-
 2 files changed, 5 insertions(+), 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
index a7827d72af2..ae0fe6e5972 100644
--- 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 class BraveVpnPreferences extends BravePreferenceFragment implements Brav
                                         @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
index 4b2bfa4eb1f..88d85e3a5b8 100644
--- 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 class VpnRegionPreference extends Preference {
         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 =