diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2021-07-11 22:52:26 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-11 17:22:26 +0000 |
| commit | 6e4ffe290265ef8b3cd82f5ab6a7eb8c0157bf6a (patch) | |
| tree | 13739c1079e5cd4ce609cdbb4501450b2eabecb4 /app/src/main/java/dev/msfjarvis/aps/ui/passwords | |
| parent | 9c388e49748084bdac3fb277ea507b80b9c7c33a (diff) | |
| download | HardenedPass-6e4ffe290265ef8b3cd82f5ab6a7eb8c0157bf6a.tar.gz HardenedPass-6e4ffe290265ef8b3cd82f5ab6a7eb8c0157bf6a.zip | |
Add initial implementation of Gopenpgp-backed PGP (#1441)
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/passwords')
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt index 892289af..38c97f36 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt @@ -38,6 +38,7 @@ import dev.msfjarvis.aps.data.password.PasswordItem import dev.msfjarvis.aps.data.repo.PasswordRepository import dev.msfjarvis.aps.ui.crypto.BasePgpActivity.Companion.getLongName import dev.msfjarvis.aps.ui.crypto.DecryptActivity +import dev.msfjarvis.aps.ui.crypto.GopenpgpDecryptActivity import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet import dev.msfjarvis.aps.ui.dialogs.FolderCreationDialogFragment @@ -46,6 +47,7 @@ import dev.msfjarvis.aps.ui.git.base.BaseGitActivity import dev.msfjarvis.aps.ui.onboarding.activity.OnboardingActivity import dev.msfjarvis.aps.ui.settings.DirectorySelectionActivity import dev.msfjarvis.aps.ui.settings.SettingsActivity +import dev.msfjarvis.aps.util.FeatureFlags import dev.msfjarvis.aps.util.autofill.AutofillMatcher import dev.msfjarvis.aps.util.extensions.base64 import dev.msfjarvis.aps.util.extensions.commitChange @@ -422,7 +424,14 @@ class PasswordStore : BaseGitActivity() { val authDecryptIntent = item.createAuthEnabledIntent(this) val decryptIntent = (authDecryptIntent.clone() as Intent).setComponent( - ComponentName(this, DecryptActivity::class.java) + ComponentName( + this, + if (FeatureFlags.ENABLE_GOPENPGP) { + GopenpgpDecryptActivity::class.java + } else { + DecryptActivity::class.java + } + ) ) startActivity(decryptIntent) |