From 4d34e5510f3a05b52c7cd3e5077ffbfd07859a62 Mon Sep 17 00:00:00 2001 From: brave-builds <45370463+brave-builds@users.noreply.github.com> Date: Wed, 25 Jan 2023 09:08:55 +0100 Subject: [PATCH] Fixes a crash on a DApp websites when we execute a wallet detection event on Android (uplift to 1.47.x) (#16847) --- .../brave_wallet_provider_delegate_impl_helper_android.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/browser/brave_wallet/brave_wallet_provider_delegate_impl_helper_android.cc b/browser/brave_wallet/brave_wallet_provider_delegate_impl_helper_android.cc index b253b2328599..2ede7045461d 100644 --- a/browser/brave_wallet/brave_wallet_provider_delegate_impl_helper_android.cc +++ b/browser/brave_wallet/brave_wallet_provider_delegate_impl_helper_android.cc @@ -27,14 +27,15 @@ void ShowWalletOnboarding(content::WebContents*) { Java_BraveWalletProviderDelegateImplHelper_showWalletOnboarding(env); } -void ShowAccountCreation(content::WebContents* web_contents, - const std::string& keyring_id) { +void ShowAccountCreation(content::WebContents*, const std::string& keyring_id) { JNIEnv* env = base::android::AttachCurrentThread(); Java_BraveWalletProviderDelegateImplHelper_ShowAccountCreation( env, base::android::ConvertUTF8ToJavaString(env, keyring_id)); } void WalletInteractionDetected(content::WebContents* web_contents) { + if (!web_contents) + return; Java_BraveWalletProviderDelegateImplHelper_walletInteractionDetected( base::android::AttachCurrentThread(), web_contents->GetJavaWebContents()); }