Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update obsolete Nfc class prefixes | Nikita Mikhailov | 2016-04-16 | 1 | -7/+7 |
| | |||||
* | OTG: Rename smartcard -> security token | Nikita Mikhailov | 2016-04-15 | 1 | -9/+9 |
| | |||||
* | OTG: refactor, change nfc prefix to smartcard | Nikita Mikhailov | 2016-04-14 | 1 | -9/+9 |
| | |||||
* | add method to skip caching | Vincent Breitmoser | 2016-01-06 | 1 | -0/+4 |
| | |||||
* | Integrate yubikey reset method | Dominik Schürmann | 2015-10-16 | 1 | -1/+6 |
| | |||||
* | Support backupVersion ASCII Armor header | Dominik Schürmann | 2015-10-15 | 1 | -2/+7 |
| | |||||
* | added licenses, cleaned up code, fixed warnings | Adithya Abraham Philip | 2015-07-13 | 1 | -1/+0 |
| | |||||
* | added retry on upload failure | Adithya Abraham Philip | 2015-07-13 | 1 | -0/+6 |
| | |||||
* | implemented revocation on deletion | Adithya Abraham Philip | 2015-07-13 | 1 | -1/+1 |
| | |||||
* | added proxy support to OperationHelper | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+5 |
| | |||||
* | Change PIN and Admin PIN after move to key operation | Dominik Schürmann | 2015-07-02 | 1 | -25/+48 |
| | |||||
* | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 1 | -3/+3 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-29 | 1 | -6/+16 |
|\ | |||||
| * | Partially revert "make masterKeyId and subKeyId strictly required in ↵ | Vincent Breitmoser | 2015-05-28 | 1 | -6/+16 |
| | | | | | | | | | | | | CryptoInputParcel" We do need empty masterKeyIds for symmetric passphrases, whoops :) | ||||
* | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -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 CryptoInputParcel | Vincent Breitmoser | 2015-05-28 | 1 | -24/+14 |
| | | |||||
* | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 1 | -7/+43 |
| | | |||||
* | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 1 | -1/+6 |
|/ | |||||
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 1 | -12/+35 |
| | |||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -6/+6 |
| | |||||
* | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 1 | -0/+4 |
| | |||||
* | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 1 | -9/+30 |
| | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify() | ||||
* | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -0/+4 |
| | |||||
* | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 1 | -0/+162 |