mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-11 11:35:07 -05:00
Merge branch 'master' of github.com:dschuermann/openpgp-keychain
This commit is contained in:
commit
39c172aa88
@ -92,6 +92,8 @@ public class KeyListAdapter extends CursorTreeAdapter {
|
||||
|
||||
if (mainUserIdRest.getText().length() == 0) {
|
||||
mainUserIdRest.setVisibility(View.GONE);
|
||||
} else {
|
||||
mainUserIdRest.setVisibility(View.VISIBLE);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -50,17 +50,17 @@ To do automatic encryption/decryption/sign/verify use the OpenPGP Remote API.
|
||||
#### OpenPGP Keychain specific Intent actions:
|
||||
|
||||
* ``org.sufficientlysecure.keychain.action.ENCRYPT``
|
||||
* To encrypt text use extra ``text`` (type: ``String``)
|
||||
* To encrypt or sign text, use extra ``text`` (type: ``String``)
|
||||
* or set data ``Uri`` (``intent.setData()``) pointing to a file
|
||||
* Enable ASCII Armor for file encryption (encoding to Radix-64, 33% overhead) by adding the extra ``ascii_armor`` with value ``true``
|
||||
* ``org.sufficientlysecure.keychain.action.DECRYPT``
|
||||
* To decrypt text use extra ``text`` (type: ``String``)
|
||||
* To decrypt or verify text, use extra ``text`` (type: ``String``)
|
||||
* or set data ``Uri`` (``intent.setData()``) pointing to a file
|
||||
* ``org.sufficientlysecure.keychain.action.IMPORT_KEY``
|
||||
* Extras: ``key_bytes`` (type: ``byte[]``)
|
||||
* or set data ``Uri`` (``intent.setData()``) pointing to a file
|
||||
* ``org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE``
|
||||
* without extras starts Barcode Scanner to get QR Code
|
||||
* without extras, starts Barcode Scanner to get QR Code
|
||||
|
||||
## OpenPGP Remote API
|
||||
To do asyncronous fast encryption/decryption/sign/verify operations bind to the OpenPGP remote service.
|
||||
|
Loading…
Reference in New Issue
Block a user