From 5e9a91a3b821e356f74f1728372a58220c49069c Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 30 May 2021 02:59:13 +0530 Subject: app: replace some uses of getEncryptedGitPrefs Signed-off-by: Harsh Shandilya --- .../java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt index cc2cd4c7..83f44aa6 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt @@ -4,6 +4,7 @@ */ package dev.msfjarvis.aps.ui.sshkeygen +import android.content.SharedPreferences import android.os.Bundle import android.security.keystore.UserNotAuthenticatedException import android.view.MenuItem @@ -16,13 +17,15 @@ import androidx.lifecycle.lifecycleScope import com.github.michaelbull.result.fold import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder +import dagger.hilt.android.AndroidEntryPoint import dev.msfjarvis.aps.R import dev.msfjarvis.aps.databinding.ActivitySshKeygenBinding +import dev.msfjarvis.aps.injection.prefs.GitPreferences import dev.msfjarvis.aps.util.auth.BiometricAuthenticator -import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs import dev.msfjarvis.aps.util.extensions.keyguardManager import dev.msfjarvis.aps.util.extensions.viewBinding import dev.msfjarvis.aps.util.git.sshj.SshKey +import javax.inject.Inject import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine import kotlinx.coroutines.Dispatchers @@ -41,10 +44,12 @@ private enum class KeyGenType(val generateKey: suspend (requireAuthentication: B }), } +@AndroidEntryPoint class SshKeyGenActivity : AppCompatActivity() { private var keyGenType = KeyGenType.Ecdsa private val binding by viewBinding(ActivitySshKeygenBinding::inflate) + @GitPreferences @Inject lateinit var gitPrefs: SharedPreferences override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -129,7 +134,7 @@ class SshKeyGenActivity : AppCompatActivity() { keyGenType.generateKey(requireAuthentication) } } - getEncryptedGitPrefs().edit { remove("ssh_key_local_passphrase") } + gitPrefs.edit { remove("ssh_key_local_passphrase") } binding.generate.apply { text = getString(R.string.ssh_keygen_generate) isEnabled = true -- cgit v1.2.3