From 0d3139ffc193c17cdd6277bfe7960c8d9e927f2c Mon Sep 17 00:00:00 2001 From: Hoang Hiep Date: Fri, 17 May 2019 17:39:42 +0700 Subject: [PATCH] Fixed bug crash #1 change PIN code thanks @sagorahmed --- .../bitcoin/wallet/btc/base/BaseBottomSheetDialogFragment.kt | 2 +- .../java/com/bitcoin/wallet/btc/ui/fragments/BackupDialog.kt | 1 + .../wallet/btc/ui/fragments/EncryptKeysDialogFragment.kt | 2 ++ .../com/bitcoin/wallet/btc/ui/fragments/RestoreWalletDialog.kt | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mobile/src/main/java/com/bitcoin/wallet/btc/base/BaseBottomSheetDialogFragment.kt b/mobile/src/main/java/com/bitcoin/wallet/btc/base/BaseBottomSheetDialogFragment.kt index 3b0f680..d8330f9 100755 --- a/mobile/src/main/java/com/bitcoin/wallet/btc/base/BaseBottomSheetDialogFragment.kt +++ b/mobile/src/main/java/com/bitcoin/wallet/btc/base/BaseBottomSheetDialogFragment.kt @@ -103,7 +103,7 @@ abstract class BaseBottomSheetDialogFragment : BottomSheetDialogFragment(), HasS } private fun onGlobalLayoutChanged(view: View) { - val parent = dialog?.findViewById(R.id.design_bottom_sheet); + val parent = dialog?.findViewById(R.id.design_bottom_sheet) if (parent != null) { val toggleArrow = view.findViewById(R.id.toggleArrow) toggleArrow?.setState(ExpandIconView.LESS, true) diff --git a/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/BackupDialog.kt b/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/BackupDialog.kt index 02952eb..ab660df 100755 --- a/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/BackupDialog.kt +++ b/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/BackupDialog.kt @@ -267,6 +267,7 @@ class BackupDialog : BaseBottomSheetDialogFragment() { companion object { fun show(activity: AppCompatActivity) { val fragment = BackupDialog() + fragment.isCancelable = false fragment.show(activity.supportFragmentManager, "receive_fragment") } diff --git a/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/EncryptKeysDialogFragment.kt b/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/EncryptKeysDialogFragment.kt index c99cf7c..2762ba5 100755 --- a/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/EncryptKeysDialogFragment.kt +++ b/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/EncryptKeysDialogFragment.kt @@ -22,6 +22,7 @@ import kotlinx.android.synthetic.main.dialog_encrypt.* import org.bitcoinj.crypto.KeyCrypterException import org.bitcoinj.crypto.KeyCrypterScrypt + class EncryptKeysDialogFragment : BaseBottomSheetDialogFragment() { private val handler = Handler() private val backgroundThread: HandlerThread by lazy { @@ -196,6 +197,7 @@ class EncryptKeysDialogFragment : BaseBottomSheetDialogFragment() { companion object { fun show(activity: AppCompatActivity) { val fragment = EncryptKeysDialogFragment() + fragment.isCancelable = false fragment.show(activity.supportFragmentManager, EncryptKeysDialogFragment::class.java.simpleName) } } diff --git a/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/RestoreWalletDialog.kt b/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/RestoreWalletDialog.kt index ba73999..777c690 100755 --- a/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/RestoreWalletDialog.kt +++ b/mobile/src/main/java/com/bitcoin/wallet/btc/ui/fragments/RestoreWalletDialog.kt @@ -288,6 +288,7 @@ class PermissionDeniedDialogFragment : DialogFragment() { fun showDialog(fm: FragmentManager) { val newFragment = PermissionDeniedDialogFragment() + newFragment.isCancelable = false newFragment.show(fm, FRAGMENT_TAG) } }