From 4d83b64ad9acea8a6cb63811be83f56364ec7e81 Mon Sep 17 00:00:00 2001 From: Deep Date: Fri, 20 May 2022 07:27:52 -0400 Subject: [PATCH] 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 | 1 + .../browser/vpn/utils/BraveVpnApiResponseUtils.java | 9 +++++++++ browser/ui/android/strings/android_brave_strings.grd | 11 +++++++---- build/android/config.gni | 1 + patches/chrome-android-java-AndroidManifest.xml.patch | 4 ++-- 5 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 android/java/AndroidManifest_user_permissions.xml diff --git a/android/java/AndroidManifest_user_permissions.xml b/android/java/AndroidManifest_user_permissions.xml new file mode 100644 index 00000000000..cb6d4013057 --- /dev/null +++ b/android/java/AndroidManifest_user_permissions.xml @@ -0,0 +1 @@ + diff --git a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnApiResponseUtils.java b/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnApiResponseUtils.java index 573b2690954..39192ceb6f0 100644 --- a/android/java/org/chromium/chrome/browser/vpn/utils/BraveVpnApiResponseUtils.java +++ b/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( diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index b2f778a2cf9..57bba12493b 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/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. - Purchase verification failed. Please try again. + Your subscription has expired. You can subscribe again at any time. 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. - ERROR!!\nCaused by a user cancelling the purchase flow. + You've quit your subscription purchase. - ERROR!!\nPurchase failed.. + Purchase failed. Please contact Google Play support. 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. - Permission was cancelled + You've stopped the installation of the VPN profile. Reject 4%1$s transactions @@ -3037,6 +3037,9 @@ If you don't accept this request, VPN will not reconnect and your internet conne Select Account + + Couldn't get matching timezone for : %1$s + diff --git a/build/android/config.gni b/build/android/config.gni index d474251b032..dff969c1de5 100644 --- a/build/android/config.gni +++ b/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 = [ diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 87b0f01eb5d..f9f21abda62 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/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. -+ ++ {% include "//brave/android/java/AndroidManifest_user_permissions.xml" %}