From c2cedab881e1cc897d97233ea6c2f35239201649 Mon Sep 17 00:00:00 2001 From: Corewala Date: Thu, 19 May 2022 13:39:10 -0400 Subject: [PATCH] combined createBiometricPrompt function versions --- .../io/keymanager/BuranBiometricManager.kt | 18 ++++++------------ .../main/java/corewala/buran/ui/GemActivity.kt | 2 +- .../buran/ui/settings/SettingsFragment.kt | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/corewala/buran/io/keymanager/BuranBiometricManager.kt b/app/src/main/java/corewala/buran/io/keymanager/BuranBiometricManager.kt index 1940748..164d7df 100644 --- a/app/src/main/java/corewala/buran/io/keymanager/BuranBiometricManager.kt +++ b/app/src/main/java/corewala/buran/io/keymanager/BuranBiometricManager.kt @@ -26,19 +26,13 @@ class BuranBiometricManager { private lateinit var biometricPrompt: BiometricPrompt private lateinit var promptInfo: BiometricPrompt.PromptInfo - fun createBiometricPrompt(context: Context, fragment: Fragment, callback: BiometricPrompt.AuthenticationCallback){ + fun createBiometricPrompt(context: Context, fragment: Fragment?, activity: FragmentActivity?, callback: BiometricPrompt.AuthenticationCallback){ val executor = ContextCompat.getMainExecutor(context) - biometricPrompt = BiometricPrompt(fragment, executor, callback) - promptInfo = BiometricPrompt.PromptInfo.Builder() - .setConfirmationRequired(false) - .setTitle(context.getString(R.string.confirm_your_identity)) - .setSubtitle(context.getString(R.string.use_biometric_unlock)) - .setNegativeButtonText(context.getString(R.string.cancel).toUpperCase()) - .build() - } - fun createBiometricPrompt(context: Context, activity: FragmentActivity, callback: BiometricPrompt.AuthenticationCallback){ - val executor = ContextCompat.getMainExecutor(context) - biometricPrompt = BiometricPrompt(activity, executor, callback) + if(fragment != null){ + biometricPrompt = BiometricPrompt(fragment, executor, callback) + }else if(activity != null){ + biometricPrompt = BiometricPrompt(activity, executor, callback) + } promptInfo = BiometricPrompt.PromptInfo.Builder() .setConfirmationRequired(false) .setTitle(context.getString(R.string.confirm_your_identity)) diff --git a/app/src/main/java/corewala/buran/ui/GemActivity.kt b/app/src/main/java/corewala/buran/ui/GemActivity.kt index f876199..a9c711f 100644 --- a/app/src/main/java/corewala/buran/ui/GemActivity.kt +++ b/app/src/main/java/corewala/buran/ui/GemActivity.kt @@ -600,7 +600,7 @@ class GemActivity : AppCompatActivity() { )!! ) - biometricManager.createBiometricPrompt(this, this, callback) + biometricManager.createBiometricPrompt(this, null, this, callback) biometricManager.authenticateToDecryptData(initializationVector) } diff --git a/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt b/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt index c408723..ba0aa3f 100644 --- a/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt +++ b/app/src/main/java/corewala/buran/ui/settings/SettingsFragment.kt @@ -343,7 +343,7 @@ class SettingsFragment: PreferenceFragmentCompat(), Preference.OnPreferenceChang } } - biometricManager.createBiometricPrompt(requireContext(), this, callback) + biometricManager.createBiometricPrompt(requireContext(), this, null, callback) if(newValue as Boolean){ biometricManager.authenticateToEncryptData()