Fixed bug crash #1 change PIN code

thanks @sagorahmed
hoanghiephui · May 17, 2019 · 0d3139f · 0d3139f
1 parent 3c22568
commit 0d3139f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 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
@@ -103,7 +103,7 @@ abstract class BaseBottomSheetDialogFragment : BottomSheetDialogFragment(), HasS
     }
 
     private fun onGlobalLayoutChanged(view: View) {
-        val parent = dialog?.findViewById<ViewGroup>(R.id.design_bottom_sheet);
+        val parent = dialog?.findViewById<ViewGroup>(R.id.design_bottom_sheet)
         if (parent != null) {
             val toggleArrow = view.findViewById<ExpandIconView?>(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
@@ -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
@@ -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
@@ -288,6 +288,7 @@ class PermissionDeniedDialogFragment : DialogFragment() {
 
         fun showDialog(fm: FragmentManager) {
             val newFragment = PermissionDeniedDialogFragment()
+            newFragment.isCancelable = false
             newFragment.show(fm, FRAGMENT_TAG)
         }
     }