kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add getkeyids support

Browse source
This commit is contained in:
Mohamed Zenadi 2017-07-29 21:21:46 +01:00 committed by Mohamed Zenadi
parent 7a3caad76f
commit 200fe9ebe0
1 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
View file

@ -339,7 +339,45 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
data.putExtra("fromDecrypt", true)
intent = data
invalidateOptionsMenu()
}
/**
* Get the Key ids from OpenKeychain
*/
fun getKeyIds() {
val data = Intent()
data.action = OpenPgpApi.ACTION_GET_KEY_IDS
val api = OpenPgpApi(this, mServiceConnection?.getService())
api.executeApiAsync(data, null, null, { result: Intent? ->
when (result?.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)) {
OpenPgpApi.RESULT_CODE_SUCCESS -> {
try {
val ids = result.getLongArrayExtra(OpenPgpApi.RESULT_KEY_IDS)
val keys = ids.map { it.toString() }.toSet()
// use Long
settings.edit().putStringSet("openpgp_key_ids_set", keys).apply()
showToast("PGP keys selected")
setResult(RESULT_OK)
finish()
} catch (e: Exception) {
Log.e(TAG, "An Exception occurred", e)
}
}
OpenPgpApi.RESULT_CODE_ERROR -> {
// TODO show what kind of error it is
/* For example:
* No suitable key found -> no key in OpenKeyChain
*
* Check in open-pgp-lib how their definitions and error code
*/
val error: OpenPgpError = result.getParcelableExtra(OpenPgpApi.RESULT_ERROR)
handleError(error)
}
}
})
}
override fun onError(e: Exception?) {}
@ -348,7 +386,10 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
* The action to take when the PGP service is bound
*/
override fun onBound(service: IOpenPgpService2?) {
if (operation in arrayOf("EDIT", "DECRYPT")) decryptAndVerify()
when (operation) {
"EDIT", "DECRYPT" -> decryptAndVerify()
"GET_KEY_ID" -> getKeyIds()
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {