Merge branch 'develop' into rc/1.0.1

valentunn · valentunn · commit 731c2dde605e · 2020-12-01T16:11:18.000+03:00
diff --git a/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/PincodeFragment.kt b/feature-account-impl/src/main/java/jp/co/soramitsu/feature_account_impl/presentation/pincode/PincodeFragment.kt
@@ -104,6 +104,7 @@ class PincodeFragment : BaseFragment<PinCodeViewModel>() {
         MaterialAlertDialogBuilder(requireActivity(), R.style.AlertDialogTheme)
             .setTitle(R.string.pincode_biometry_dialog_title)
             .setMessage(R.string.pincode_fingerprint_switch_dialog_title)
+            .setCancelable(false)
             .setPositiveButton(R.string.common_use) { _, _ ->
                 viewModel.acceptAuthWithBiometry()
             }

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ class PincodeFragment : BaseFragment<PinCodeViewModel>() {`
`104`	`104`	`MaterialAlertDialogBuilder(requireActivity(), R.style.AlertDialogTheme)`
`105`	`105`	`.setTitle(R.string.pincode_biometry_dialog_title)`
`106`	`106`	`.setMessage(R.string.pincode_fingerprint_switch_dialog_title)`
	`107`	`+ .setCancelable(false)`
`107`	`108`	`.setPositiveButton(R.string.common_use) { _, _ ->`
`108`	`109`	`viewModel.acceptAuthWithBiometry()`
`109`	`110`	`}`