Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | revert some accidentally committed cruft | Vincent Breitmoser | 2015-05-31 | 1 | -8/+0 |
| | |||||
* | handle empty passphrases in PassphraseDialogActivity | Vincent Breitmoser | 2015-05-31 | 1 | -0/+9 |
| | |||||
* | externalize caching functionality from CertifyKeyFragment | Vincent Breitmoser | 2015-05-30 | 1 | -0/+64 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -4/+19 |
|\ | | | | | | | | | | | | | | | 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 | ||||
| * | respect cache in yubikey pin data flow | Vincent Breitmoser | 2015-05-28 | 1 | -4/+19 |
| | | |||||
| * | do nfc dispatching in MainActivity | Vincent Breitmoser | 2015-05-28 | 2 | -7/+5 |
| | | |||||
| * | open ViewKeyActivity by subkey in NfcBaseActivity | Vincent Breitmoser | 2015-05-17 | 1 | -3/+4 |
| | | |||||
* | | do nfc dispatching in MainActivity | Vincent Breitmoser | 2015-05-17 | 2 | -7/+5 |
| | | |||||
* | | open ViewKeyActivity by subkey in NfcBaseActivity | Vincent Breitmoser | 2015-05-17 | 1 | -3/+4 |
| | | |||||
* | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 1 | -24/+2 |
| | | |||||
* | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 2 | -7/+247 |
|/ | |||||
* | Switch to new support lib version 22.1 | Dominik Schürmann | 2015-04-25 | 1 | -2/+2 |
| | |||||
* | Fix for initialization failure when card returns FCI in data field. | Joey Castillo | 2015-04-20 | 1 | -1/+1 |
| | |||||
* | Track state of PIN verification on smart card; only verify when needed. | Joey Castillo | 2015-04-20 | 1 | -2/+33 |
| | |||||
* | Temporarily fix devices without nfc | Dominik Schürmann | 2015-04-18 | 1 | -0/+6 |
| | |||||
* | More cleanup | Dominik Schürmann | 2015-04-15 | 2 | -2/+133 |
| | |||||
* | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 1 | -5/+20 |
| | |||||
* | Reformat nfcVerifyPIN | Dominik Schürmann | 2015-04-15 | 1 | -6/+6 |
| | |||||
* | Consolidate PIN verify operation in nfcVerifyPIN method. | Joey Castillo | 2015-04-14 | 1 | -44/+28 |
| | |||||
* | Move PIN verify inside sign/decrypt operation and set correct mode. | Joey Castillo | 2015-04-14 | 1 | -19/+45 |
| | |||||
* | work on passphrase data flow | Vincent Breitmoser | 2015-03-31 | 1 | -0/+6 |
| | |||||
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+1 |
| | |||||
* | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 1 | -18/+17 |
| | |||||
* | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -5/+8 |
| | |||||
* | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 1 | -2/+44 |
| | |||||
* | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 1 | -3/+8 |
| | |||||
* | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -4/+3 |
| | |||||
* | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 2 | -0/+587 |
- move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity |