diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-22 15:23:43 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-22 15:23:43 +0200 |
commit | 39c172aa88bf3b83d297d85707e088de2c2161c8 (patch) | |
tree | 6981e9be0c1533eda60a30660d6468d6d84ab3f1 | |
parent | ac180275fd838887b6f08a2671db75195e9181d0 (diff) | |
parent | 9f631f4dd45d354b00f643d88676ecbb8f8023a7 (diff) | |
download | open-keychain-39c172aa88bf3b83d297d85707e088de2c2161c8.tar.gz open-keychain-39c172aa88bf3b83d297d85707e088de2c2161c8.tar.bz2 open-keychain-39c172aa88bf3b83d297d85707e088de2c2161c8.zip |
Merge branch 'master' of github.com:dschuermann/openpgp-keychain
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyListAdapter.java | 2 | ||||
-rw-r--r-- | README.md | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyListAdapter.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyListAdapter.java index 989036a7f..780520cb1 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyListAdapter.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/widget/KeyListAdapter.java @@ -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. |