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 /app/src/main/java/com/zeapo | |
parent | 91f5797262e7d82bc65146c4246e71d654e229be (diff) |
Correctly unmarshal errors from OpenKeychain (#615)
Fixes #614
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
Diffstat (limited to 'app/src/main/java/com/zeapo')
-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 |
2 files changed, 2 insertions, 2 deletions
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 { |