Update error messages based on suggestions

Address PR comment for manifest patch

Add new line for AndroidManifest_user_permissions.xml

android/java/AndroidManifest_user_permissions.xml

@@ -0,0 +1 @@
+<uses-permission android:name="com.android.vending.BILLING"/>

android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnApiResponseUtils.java

@@ -53,6 +53,15 @@ public class BraveVpnApiResponseUtils {
         if (isSuccess) {
             String region = BraveVpnUtils.getRegionForTimeZone(
                     jsonTimezones, TimeZone.getDefault().getID());
+            if (TextUtils.isEmpty(region)) {
+                Toast.makeText(activity,
+                             String.format(activity.getResources().getString(
+                                                   R.string.couldnt_get_matching_timezone),
+                                     TimeZone.getDefault().getID()),
+                             Toast.LENGTH_LONG)
+                        .show();
+                return;
+            }
             if (!TextUtils.isEmpty(BraveVpnUtils.selectedServerRegion)
                     && BraveVpnUtils.selectedServerRegion != null) {
                 region = BraveVpnUtils.selectedServerRegion.equals(

browser/ui/android/strings/android_brave_strings.grd

@@ -2306,7 +2306,7 @@ If you don't accept this request, VPN will not reconnect and your internet conne
       Vpn profile creation failed. Please try again.
     </message>
     <message name="IDS_PURCHASE_TOKEN_VERIFICATION_FAILED" desc="Brave VPN profile text">
-      Purchase verification failed. Please try again.
+      Your subscription has expired. You can subscribe again at any time.
     </message>
     <message name="IDS_BRAVE_VPN_NOTIFICATION_MESSAGE" desc="Brave VPN notification message">
       VPN is running in the background
@@ -2423,10 +2423,10 @@ If you don't accept this request, VPN will not reconnect and your internet conne
       You are already subscribed to the subscription. Try restoring the subscription.
     </message>
     <message name="IDS_ERROR_CAUSED_BY_USER" desc="Brave Vpn in app purchase message">
-      ERROR!!\nCaused by a user cancelling the purchase flow.
+      You've quit your subscription purchase.
     </message>
     <message name="IDS_PURCHASED_FAILED" desc="Brave Vpn in app purchase message">
-      ERROR!!\nPurchase failed..
+      Purchase failed. Please contact Google Play support.
     </message>
     <message name="IDS_REJECT" desc="Brave crypto wallet button reject">
       Reject
@@ -2966,7 +2966,7 @@ If you don't accept this request, VPN will not reconnect and your internet conne
       You have already selected the same server.
     </message>
     <message name="IDS_PERMISSION_WAS_CANCELLED" desc="Vpn user consent text">
-      Permission was cancelled
+      You've stopped the installation of the VPN profile.
     </message>
     <message name="IDS_BRAVE_WALLET_QUEUE_REJECT_ALL" desc="Confirm Transaction Queue Reject All Transactions">
       Reject <ph name="TRANSACTION_LENGTH"><ex>4</ex>%1$s</ph> transactions
@@ -3037,6 +3037,9 @@ If you don't accept this request, VPN will not reconnect and your internet conne
     <message name="IDS_BRAVE_WALLET_ACCOUNT_SELECTOR_ACTIVITY_TITLE" desc="Account Selector activity toolbar title">
       Select Account
     </message>
+    <message name="IDS_COULDNT_GET_MATCHING_TIMEZONE" desc="Brave vpn error message">
+      Couldn't get matching timezone for : <ph name="VALUE">%1$s</ph>
+    </message>
   </messages>
   </release>
 </grit>

build/android/config.gni

@@ -10,6 +10,7 @@ declare_args() {
 brave_android_manifest_includes = [
   "//brave/android/java/AndroidManifest.xml",
   "//brave/android/java/AndroidManifest_intent_filters.xml",
+  "//brave/android/java/AndroidManifest_user_permissions.xml",
 ]
 
 brave_chrome_java_deps = [

patches/chrome-android-java-AndroidManifest.xml.patch

@@ -1,12 +1,12 @@
 diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
-index b31d14a673bb536c55ca146a3ad0100f6814e13f..24142dc73b58e9e041a2d2707dc3617ffcb6445a 100644
+index b31d14a673bb536c55ca146a3ad0100f6814e13f..2df2b5599914355fdbae3997ca7a5f0d4eca03e5 100644
 --- a/chrome/android/java/AndroidManifest.xml
 +++ b/chrome/android/java/AndroidManifest.xml
 @@ -26,6 +26,7 @@ by a child template that "extends" this file.
      <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
      <uses-permission-sdk-23 android:name="android.permission.ACCESS_WIFI_STATE" />
      <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-+    <uses-permission android:name="com.android.vending.BILLING"/>
++    {% include "//brave/android/java/AndroidManifest_user_permissions.xml" %}
  
      <!--
        Enable runtime permissions as uses-permission in tip of tree builds