diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AccountPrivateKeyActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AccountPrivateKeyActivity.java index f2555e9c718..bc54a694ec3 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AccountPrivateKeyActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AccountPrivateKeyActivity.java @@ -33,6 +33,7 @@ public class AccountPrivateKeyActivity private KeyringController mKeyringController; private String mAddress; private boolean mIsPrivateKeyShown; + @Override protected void triggerLayoutInflation() { setContentView(R.layout.activity_account_private_key); @@ -105,8 +106,15 @@ public class AccountPrivateKeyActivity return super.onOptionsItemSelected(item); } + @Override + protected void onDestroy() { + super.onDestroy(); + mKeyringController.close(); + } + @Override public void onConnectionError(MojoException e) { + mKeyringController.close(); mKeyringController = null; InitKeyringController(); } diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AddAccountActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AddAccountActivity.java index d34cb246b13..cea11d3b478 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AddAccountActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AddAccountActivity.java @@ -165,8 +165,15 @@ public class AddAccountActivity onInitialLayoutInflationComplete(); } + @Override + protected void onDestroy() { + super.onDestroy(); + mKeyringController.close(); + } + @Override public void onConnectionError(MojoException e) { + mKeyringController.close(); mKeyringController = null; InitKeyringController(); } diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AssetDetailActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AssetDetailActivity.java index 14422f19ec3..9a6aca42b1a 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AssetDetailActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/AssetDetailActivity.java @@ -54,6 +54,8 @@ public class AssetDetailActivity extends AsyncInitializationActivity @Override protected void onDestroy() { super.onDestroy(); + mKeyringController.close(); + mAssetRatioController.close(); } @Override @@ -203,6 +205,9 @@ public class AssetDetailActivity extends AsyncInitializationActivity @Override public void onConnectionError(MojoException e) { + mKeyringController.close(); + mAssetRatioController.close(); + mAssetRatioController = null; InitAssetRatioController(); diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java index 40dc0ee2300..3b77ac1f8f8 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BraveWalletActivity.java @@ -166,6 +166,13 @@ public class BraveWalletActivity @Override public void onConnectionError(MojoException e) { + mKeyringController.close(); + mAssetRatioController.close(); + mErcTokenRegistry.close(); + mEthJsonRpcController.close(); + mEthTxController.close(); + mBraveWalletService.close(); + mKeyringController = null; mErcTokenRegistry = null; mEthJsonRpcController = null; @@ -281,6 +288,12 @@ public class BraveWalletActivity if (mKeyringController != null) { mKeyringController.lock(); } + mKeyringController.close(); + mAssetRatioController.close(); + mErcTokenRegistry.close(); + mEthJsonRpcController.close(); + mEthTxController.close(); + mBraveWalletService.close(); mModalDialogManager.destroy(); super.onDestroy(); } diff --git a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java index 370fa264390..5aa1404d2a5 100644 --- a/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java +++ b/android/java/org/chromium/chrome/browser/crypto_wallet/activities/BuySendSwapActivity.java @@ -188,6 +188,12 @@ public class BuySendSwapActivity extends AsyncInitializationActivity if (mCameraSourcePreview != null) { mCameraSourcePreview.release(); } + mKeyringController.close(); + mAssetRatioController.close(); + mErcTokenRegistry.close(); + mEthJsonRpcController.close(); + mEthTxController.close(); + mSwapController.close(); } @Override @@ -1108,6 +1114,13 @@ public class BuySendSwapActivity extends AsyncInitializationActivity @Override public void onConnectionError(MojoException e) { + mKeyringController.close(); + mAssetRatioController.close(); + mErcTokenRegistry.close(); + mEthJsonRpcController.close(); + mEthTxController.close(); + mSwapController.close(); + mErcTokenRegistry = null; mEthJsonRpcController = null; mEthTxController = null;