diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-01-25 20:19:49 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-25 20:19:49 +0530 |
| commit | 14f1fa65381375149dbb3fcdba578b6b4799645e (patch) | |
| tree | e7294855780d18b4a82d8d84d51b86e212d4adb0 | |
| parent | 91f5797262e7d82bc65146c4246e71d654e229be (diff) | |
Correctly unmarshal errors from OpenKeychain (#615)
Fixes #614
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.kt | 2 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt | 2 | ||||
| -rw-r--r-- | dependencies.gradle | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d55c6878..0c9713e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # Changelog All notable changes to this project will be documented in this file. -## [1.4.0] - TBD +## Unreleased + +### Fixed +- OpenKeychain errors cause app crash + +## [1.4.0] - 2020-01-24 ### Added - Add save-and-copy button diff --git a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.kt b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.kt index 100ce145..24c4b1f5 100644 --- a/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.kt +++ b/app/src/main/java/com/zeapo/pwdstore/autofill/AutofillService.kt @@ -40,11 +40,11 @@ import java.net.MalformedURLException import java.net.URL import java.util.ArrayList import java.util.Locale -import me.msfjarvis.openpgpktx.OpenPgpError import me.msfjarvis.openpgpktx.util.OpenPgpApi import me.msfjarvis.openpgpktx.util.OpenPgpServiceConnection import org.apache.commons.io.FileUtils import org.openintents.openpgp.IOpenPgpService2 +import org.openintents.openpgp.OpenPgpError class AutofillService : AccessibilityService() { private var serviceConnection: OpenPgpServiceConnection? = null diff --git a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt index b0fc8684..4e0e409a 100644 --- a/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt +++ b/app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt @@ -54,7 +54,6 @@ import kotlinx.android.synthetic.main.encrypt_layout.generate_password import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import me.msfjarvis.openpgpktx.OpenPgpError import me.msfjarvis.openpgpktx.util.OpenPgpApi import me.msfjarvis.openpgpktx.util.OpenPgpApi.Companion.ACTION_DECRYPT_VERIFY import me.msfjarvis.openpgpktx.util.OpenPgpApi.Companion.RESULT_CODE @@ -67,6 +66,7 @@ import me.msfjarvis.openpgpktx.util.OpenPgpServiceConnection import org.apache.commons.io.FileUtils import org.apache.commons.io.FilenameUtils import org.openintents.openpgp.IOpenPgpService2 +import org.openintents.openpgp.OpenPgpError class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound { private val clipboard: ClipboardManager by lazy { diff --git a/dependencies.gradle b/dependencies.gradle index 51e34c5f..60a82d1d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,7 +40,7 @@ ext.deps = [ commons_codec: 'commons-codec:commons-codec:1.13', jsch: 'com.jcraft:jsch:0.1.55', jgit: 'org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r', - openpgp_ktx: 'com.github.android-password-store:openpgp-ktx:1.1.0', + openpgp_ktx: 'com.github.android-password-store:openpgp-ktx:1.2.0', ssh_auth: 'org.sufficientlysecure:sshauthentication-api:1.0' ], |