From fddfef45d3539a877a6cbb7c9010eb7bea1dfcec Mon Sep 17 00:00:00 2001 From: Deep Date: Wed, 15 Dec 2021 17:42:23 -0500 Subject: [PATCH] Address PR comments --- .../chrome/browser/BraveWalletProvider.java | 3 ++- .../chrome/browser/app/BraveActivity.java | 2 +- .../browser/rewards/BraveRewardsPanel.java | 18 +++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/BraveWalletProvider.java b/android/java/org/chromium/chrome/browser/BraveWalletProvider.java index 5610521568e..f9feafd883f 100644 --- a/android/java/org/chromium/chrome/browser/BraveWalletProvider.java +++ b/android/java/org/chromium/chrome/browser/BraveWalletProvider.java @@ -35,7 +35,7 @@ public class BraveWalletProvider implements BraveRewardsObserver { public static final String REDIRECT_URL_KEY = "redirect_url"; public static final String UPHOLD_REDIRECT_URL = "rewards://uphold"; - public static final String UPHOLD_SUPPORT_URL = "http://uphold.com/en/brave/support"; + public static final String BRAVE_SUPPORT_URL = "https://community.brave.com"; public static final String UPHOLD_ORIGIN_URL = "http://uphold.com"; public static final String BITFLYER_REDIRECT_URL = "rewards://bitflyer"; @@ -112,6 +112,7 @@ public class BraveWalletProvider implements BraveRewardsObserver { redirect_url = jsonObj.getString(REDIRECT_URL_KEY); } } catch (JSONException e) { + Log.e("BraveRewards", e.getMessage()); } return redirect_url; } diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 9cffb281ce2..2c6901a4ef3 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -170,7 +170,7 @@ public abstract class BraveActivity extends C public static final String ADD_FUNDS_URL = "chrome://rewards/#add-funds"; public static final String REWARDS_SETTINGS_URL = "chrome://rewards/"; public static final String BRAVE_REWARDS_SETTINGS_URL = "brave://rewards/"; - public static final String BRAVE_REWARDS_SETTINGS_WALLET_PROVIDER_URL = + public static final String BRAVE_REWARDS_SETTINGS_WALLET_VERIFICATION_URL = "brave://rewards/#verify"; public static final String REWARDS_AC_SETTINGS_URL = "chrome://rewards/contribute"; public static final String REWARDS_LEARN_MORE_URL = "https://brave.com/faq-rewards/#unclaimed-funds"; diff --git a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java index 3aea051367c..5426c01df93 100644 --- a/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java +++ b/android/java/org/chromium/chrome/browser/rewards/BraveRewardsPanel.java @@ -1106,7 +1106,7 @@ public class BraveRewardsPanel } } else if (errorCode == BraveRewardsNativeWorker.LEDGER_ERROR) { // No Internet connection String args[] = {}; - Log.e(TAG, "LEDGER_ERROR"); + Log.e(TAG, "Failed to fetch rewards parameters from server"); showNotification( REWARDS_NOTIFICATION_NO_INTERNET_ID, REWARDS_NOTIFICATION_NO_INTERNET, 0, args); } @@ -1155,19 +1155,19 @@ public class BraveRewardsPanel SharedPreferences.Editor editor = sharedPref.edit(); int rightDrawable = 0; int leftDrawable = 0; - int text = 0; + int textId = 0; String walletType = mBraveRewardsNativeWorker.getExternalWalletType(); switch (status) { case BraveRewardsExternalWallet.NOT_CONNECTED: rightDrawable = R.drawable.disclosure; - text = R.string.brave_ui_wallet_button_unverified; + textId = R.string.brave_ui_wallet_button_unverified; btnVerifyWallet.setCompoundDrawablesWithIntrinsicBounds(0, 0, rightDrawable, 0); Log.e(TAG, "BraveRewardsExternalWallet.NOT_CONNECTED"); break; case BraveRewardsExternalWallet.CONNECTED: rightDrawable = R.drawable.verified_disclosure; - text = R.string.brave_ui_wallet_button_unverified; + textId = R.string.brave_ui_wallet_button_unverified; btnVerifyWallet.setCompoundDrawablesWithIntrinsicBounds(0, 0, rightDrawable, 0); break; case BraveRewardsExternalWallet.PENDING: @@ -1175,7 +1175,7 @@ public class BraveRewardsPanel editor.apply(); rightDrawable = R.drawable.verified_disclosure; - text = R.string.brave_ui_wallet_button_unverified; + textId = R.string.brave_ui_wallet_button_unverified; btnVerifyWallet.setCompoundDrawablesWithIntrinsicBounds(0, 0, rightDrawable, 0); break; case BraveRewardsExternalWallet.VERIFIED: @@ -1186,7 +1186,7 @@ public class BraveRewardsPanel ? R.drawable.uphold_white : R.drawable.ic_logo_bitflyer; rightDrawable = R.drawable.verified_disclosure; - text = R.string.brave_ui_wallet_button_verified; + textId = R.string.brave_ui_wallet_button_verified; btnVerifyWallet.setCompoundDrawablesWithIntrinsicBounds( leftDrawable, 0, rightDrawable, 0); btnVerifyWallet.setBackgroundColor(Color.TRANSPARENT); @@ -1201,7 +1201,7 @@ public class BraveRewardsPanel leftDrawable = walletType.equals(BraveWalletProvider.UPHOLD) ? R.drawable.uphold_white : R.drawable.ic_logo_bitflyer; - text = R.string.brave_ui_wallet_button_disconnected; + textId = R.string.brave_ui_wallet_button_disconnected; btnVerifyWallet.setCompoundDrawablesWithIntrinsicBounds(leftDrawable, 0, 0, 0); btnVerifyWallet.setBackgroundDrawable(ResourcesCompat.getDrawable( ContextUtils.getApplicationContext().getResources(), @@ -1249,7 +1249,8 @@ public class BraveRewardsPanel } else { if (status == BraveRewardsExternalWallet.NOT_CONNECTED) { BraveActivity.class.cast(mActivity).openNewOrSelectExistingTab( - BraveActivity.BRAVE_REWARDS_SETTINGS_WALLET_PROVIDER_URL); + BraveActivity + .BRAVE_REWARDS_SETTINGS_WALLET_VERIFICATION_URL); dismiss(); } else { int requestCode = @@ -1601,7 +1602,6 @@ public class BraveRewardsPanel } else { int[] location = new int[2]; view.getLocationOnScreen(location); - int x = location[0]; int y = location[1]; loginPopupWindow.showAtLocation(view, Gravity.NO_GRAVITY, 0, y); }