From 5096ce14d6e55393faba54924cefd8e2b76c4e7d Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Mon, 3 Feb 2025 17:01:25 -0800 Subject: [PATCH] fix: allow reset wallet to finish --- .../de/schildbach/wallet/ui/AbstractBindServiceActivity.java | 2 +- wallet/src/de/schildbach/wallet/ui/more/SecurityFragment.kt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/wallet/src/de/schildbach/wallet/ui/AbstractBindServiceActivity.java b/wallet/src/de/schildbach/wallet/ui/AbstractBindServiceActivity.java index ad8d548715..22e7b33d26 100644 --- a/wallet/src/de/schildbach/wallet/ui/AbstractBindServiceActivity.java +++ b/wallet/src/de/schildbach/wallet/ui/AbstractBindServiceActivity.java @@ -78,7 +78,7 @@ protected void onPause() { super.onPause(); } - protected void doUnbindService() { + public void doUnbindService() { if (shouldUnbind) { unbindService(serviceConnection); shouldUnbind = false; diff --git a/wallet/src/de/schildbach/wallet/ui/more/SecurityFragment.kt b/wallet/src/de/schildbach/wallet/ui/more/SecurityFragment.kt index 7f12c15cab..18f39bb1bd 100644 --- a/wallet/src/de/schildbach/wallet/ui/more/SecurityFragment.kt +++ b/wallet/src/de/schildbach/wallet/ui/more/SecurityFragment.kt @@ -198,6 +198,7 @@ class SecurityFragment : Fragment(R.layout.fragment_security) { viewModel.logEvent(AnalyticsConstants.Security.RESET_WALLET) val dialog = AdaptiveDialog.progress(getString(R.string.perm_lock_wipe_wallet)) dialog.show(requireActivity()) + (requireActivity() as AbstractBindServiceActivity).doUnbindService() viewModel.triggerWipe() { dialog.dismissAllowingStateLoss() startActivity(OnboardingActivity.createIntent(requireContext()))