diff options
author | Harsh Shandilya <me@msfjarvis.dev> | 2023-12-27 23:57:49 +0530 |
---|---|---|
committer | Harsh Shandilya <me@msfjarvis.dev> | 2023-12-27 23:57:49 +0530 |
commit | ef39ef94cfe4d1c1d04901695b9a91b441108bff (patch) | |
tree | d278419c990812f11f253e67ad1cba65049d204e /app | |
parent | d8f76b33e9ea74eb567a115dd63559f6b27b2fce (diff) |
Revert "fix: check if passphrase is necessary before asking for it"
Didn't fix the issue.
This reverts commit d8f76b33e9ea74eb567a115dd63559f6b27b2fce.
Diffstat (limited to 'app')
-rw-r--r-- | app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt | 4 | ||||
-rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt b/app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt index be3f8da3..0ce4b3e3 100644 --- a/app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt +++ b/app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt @@ -45,10 +45,6 @@ constructor( out: ByteArrayOutputStream, ) = withContext(dispatcherProvider.io()) { decryptPgp(password, identities, message, out) } - fun isPasswordProtected(message: ByteArrayInputStream): Boolean { - return pgpCryptoHandler.isPassphraseProtected(message) - } - suspend fun encrypt( identities: List<PGPIdentifier>, content: ByteArrayInputStream, diff --git a/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt index 56ac1fc0..9fb20af2 100644 --- a/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt @@ -177,7 +177,7 @@ class DecryptActivity : BasePGPActivity() { } } - private suspend fun askPassphrase( + private fun askPassphrase( isError: Boolean, gpgIdentifiers: List<PGPIdentifier>, authResult: Result, @@ -187,14 +187,6 @@ class DecryptActivity : BasePGPActivity() { } else { finish() } - if ( - !repository.isPasswordProtected( - withContext(dispatcherProvider.io()) { File(fullPath).readBytes().inputStream() } - ) - ) { - decryptWithPassphrase(password = "", gpgIdentifiers = gpgIdentifiers) - return - } val dialog = PasswordDialog() if (isError) { dialog.setError() |