From da051e3ff32a4bb72e46b86bc4cf6cd69a296239 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Wed, 5 Aug 2020 14:44:47 +0200 Subject: [PATCH] Fix biometric view visibility --- .../com/kunzisoft/keepass/activities/PasswordActivity.kt | 2 +- .../keepass/biometric/AdvancedUnlockedManager.kt | 5 ++++- .../com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt | 8 -------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt index 162a89254..f9e628aec 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt @@ -446,7 +446,6 @@ open class PasswordActivity : SpecialModeActivity() { var biometricInitialize = false if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { if (PreferencesUtil.isBiometricUnlockEnable(this)) { - if (advancedUnlockedManager == null && databaseFileUri != null) { advancedUnlockedManager = AdvancedUnlockedManager(this, databaseFileUri, @@ -478,6 +477,7 @@ open class PasswordActivity : SpecialModeActivity() { biometricInitialize = true } else { advancedUnlockedManager?.destroy() + advancedUnlockInfoView?.visibility = View.GONE } } if (!biometricInitialize) { diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt index d0120e32a..e19016506 100644 --- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt +++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt @@ -26,6 +26,7 @@ import android.provider.Settings import android.util.Log import android.view.Menu import android.view.MenuInflater +import android.view.View import android.widget.CompoundButton import android.widget.TextView import androidx.annotation.RequiresApi @@ -334,7 +335,9 @@ class AdvancedUnlockedManager(var context: FragmentActivity, } private fun showFingerPrintViews(show: Boolean) { - context.runOnUiThread { advancedUnlockInfoView?.hide = !show } + context.runOnUiThread { + advancedUnlockInfoView?.visibility = if (show) View.VISIBLE else View.GONE + } } private fun setAdvancedUnlockedTitleView(textId: Int) { diff --git a/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt b/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt index b6cd31cc6..9714bef00 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/AdvancedUnlockInfoView.kt @@ -113,12 +113,4 @@ class AdvancedUnlockInfoView @JvmOverloads constructor(context: Context, message = context.getString(textId) } - var hide: Boolean - get() { - return visibility != VISIBLE - } - set(value) { - visibility = if (value) View.GONE else View.VISIBLE - } - } \ No newline at end of file