aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/input/RequiredInputParcel.java
Commit message (Collapse)AuthorAgeFilesLines
* Update obsolete Nfc class prefixesNikita Mikhailov2016-04-161-7/+7
|
* OTG: Rename smartcard -> security tokenNikita Mikhailov2016-04-151-9/+9
|
* OTG: refactor, change nfc prefix to smartcardNikita Mikhailov2016-04-141-9/+9
|
* add method to skip cachingVincent Breitmoser2016-01-061-0/+4
|
* Integrate yubikey reset methodDominik Schürmann2015-10-161-1/+6
|
* Support backupVersion ASCII Armor headerDominik Schürmann2015-10-151-2/+7
|
* added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-131-1/+0
|
* added retry on upload failureAdithya Abraham Philip2015-07-131-0/+6
|
* implemented revocation on deletionAdithya Abraham Philip2015-07-131-1/+1
|
* added proxy support to OperationHelperAdithya Abraham Philip2015-07-031-1/+5
|
* Change PIN and Admin PIN after move to key operationDominik Schürmann2015-07-021-25/+48
|
* Create key wizard for blank YubiKeyDominik Schürmann2015-06-291-3/+3
|
* Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-291-6/+16
|\
| * Partially revert "make masterKeyId and subKeyId strictly required in ↵Vincent Breitmoser2015-05-281-6/+16
| | | | | | | | | | | | CryptoInputParcel" We do need empty masterKeyIds for symmetric passphrases, whoops :)
* | Merge remote-tracking branch 'origin/master' into developmentVincent Breitmoser2015-05-281-22/+14
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml
| * make masterKeyId and subKeyId strictly required in CryptoInputParcelVincent Breitmoser2015-05-281-24/+14
| |
* | Moving keytocard process into PgpKeyOperation.Joey Castillo2015-05-131-7/+43
| |
* | Adding NFC Key to Card operation, accessible from Edit Key activity.Joey Castillo2015-05-121-1/+6
|/
* fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-011-12/+35
|
* fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-6/+6
|
* further improve yubikey error handlingVincent Breitmoser2015-03-231-0/+4
|
* more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-211-9/+30
| | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
* support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-201-0/+4
|
* generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-191-0/+162