Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use correct pin for nfc in EncryptActivity | Vincent Breitmoser | 2014-09-24 | 1 | -1/+7 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-24 | 3 | -9/+16 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java | ||||
| * | Fix yubikey file decryption | Dominik Schürmann | 2014-09-24 | 1 | -5/+5 |
| | | |||||
| * | Yubikey text decryption working | Dominik Schürmann | 2014-09-24 | 1 | -5/+7 |
| | | |||||
| * | Yubikey decryption | Dominik Schürmann | 2014-09-24 | 2 | -9/+12 |
| | | |||||
| * | DecryptTextActivity rework | Dominik Schürmann | 2014-09-23 | 2 | -2/+4 |
| | | |||||
* | | fix signing in OK with yubikeys | Vincent Breitmoser | 2014-09-24 | 1 | -0/+11 |
|/ | |||||
* | be more precise on importresult overall error | Vincent Breitmoser | 2014-09-23 | 1 | -1/+1 |
| | |||||
* | take failed keys into account in importkeyresult notification | Vincent Breitmoser | 2014-09-23 | 1 | -1/+12 |
| | |||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 2 | -101/+129 |
| | |||||
* | reject keys with duplicate subkeys altogether | Vincent Breitmoser | 2014-09-23 | 1 | -0/+1 |
| | | | | closes #870 | ||||
* | log "unspecified" flags differently | Vincent Breitmoser | 2014-09-22 | 1 | -0/+2 |
| | |||||
* | show authenticate flag in logs | Vincent Breitmoser | 2014-09-22 | 1 | -16/+32 |
| | |||||
* | Fix LogDisplayFragment | Dominik Schürmann | 2014-09-21 | 2 | -3/+10 |
| | |||||
* | Fix ConsolidateResult, needed parcelable methods | Dominik Schürmann | 2014-09-21 | 1 | -0/+19 |
| | |||||
* | Feature to change key configuration in create key | Dominik Schürmann | 2014-09-21 | 1 | -1/+1 |
| | |||||
* | respect user id revocation signatures | Vincent Breitmoser | 2014-09-20 | 1 | -1/+5 |
| | | | | Closes #836 | ||||
* | Use key icons in import, prettify items | Dominik Schürmann | 2014-09-18 | 1 | -2/+2 |
| | |||||
* | Fixes for nfc decrypt | Dominik Schürmann | 2014-09-18 | 1 | -3/+12 |
| | |||||
* | Fix nfc signing | Dominik Schürmann | 2014-09-18 | 1 | -1/+1 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 4 | -24/+9 |
| | | | | created ui.util for everything related to formatting | ||||
* | Fix cleartext verify | Dominik Schürmann | 2014-09-17 | 1 | -0/+4 |
| | |||||
* | Passphrase handling in encrypt | Dominik Schürmann | 2014-09-17 | 1 | -7/+3 |
| | |||||
* | Work on new result handling (WIP) | Dominik Schürmann | 2014-09-17 | 4 | -14/+37 |
| | |||||
* | minor fix for passphrase test | Vincent Breitmoser | 2014-09-15 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-15 | 1 | -18/+26 |
|\ | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml | ||||
| * | Keys found on multiple servers are now imported from all of them | Tim Bray | 2014-09-13 | 1 | -18/+26 |
| | | |||||
* | | move LogLevel info into LogType enum | Vincent Breitmoser | 2014-09-15 | 3 | -272/+267 |
|/ | |||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 9 | -39/+28 |
| | |||||
* | pending results are a type of non-success | Vincent Breitmoser | 2014-09-14 | 3 | -7/+8 |
| | |||||
* | (forgot a file for previous commit) | Vincent Breitmoser | 2014-09-14 | 1 | -0/+103 |
| | |||||
* | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 2 | -9/+36 |
| | |||||
* | Temporary fix for #848, fixed pull2refresh bugs | Daniel Albert | 2014-09-13 | 1 | -26/+26 |
| | |||||
* | log warning on bad uid encoding | Vincent Breitmoser | 2014-09-13 | 1 | -0/+1 |
| | |||||
* | add a ton of logging to DecryptVerify | Vincent Breitmoser | 2014-09-13 | 1 | -0/+38 |
| | |||||
* | working version of DecryptVerifyResult | Vincent Breitmoser | 2014-09-13 | 2 | -18/+35 |
| | |||||
* | introduce OperationResultParcel for PgpDecryptVerify operations (WIP) | Vincent Breitmoser | 2014-09-13 | 2 | -39/+128 |
| | |||||
* | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 8 | -356/+443 |
| | |||||
* | editKey: add support for sripping keys | Vincent Breitmoser | 2014-09-11 | 2 | -0/+6 |
| | |||||
* | Add newly discussed design decisions for passphrase cache service | Dominik Schürmann | 2014-09-10 | 1 | -0/+9 |
| | |||||
* | add some comments to previous commit | Vincent Breitmoser | 2014-09-10 | 1 | -1/+7 |
| | |||||
* | jury-rig broken sign mechanism | Vincent Breitmoser | 2014-09-09 | 1 | -7/+14 |
| | | | | Should improve situation on #811 | ||||
* | Consolidate on database upgrade | Dominik Schürmann | 2014-09-09 | 1 | -3/+3 |
| | |||||
* | introduce SingletonResult for... singleton results | Vincent Breitmoser | 2014-09-08 | 1 | -1/+57 |
| | |||||
* | Properly handle uneditable key types in EditKeyFragment | Vincent Breitmoser | 2014-09-08 | 1 | -0/+6 |
| | | | | | | | More specifically, return an OperationResultParcel for stripped and divert-to-card keys, with an appropriate error message in the log. part of #828 | ||||
* | Yubikey: use PIN | Dominik Schürmann | 2014-09-08 | 1 | -0/+2 |
| | |||||
* | Prepare Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -1/+2 |
| | |||||
* | Add experimental support for yubikey PINs, remove caching of empty passphrases | Dominik Schürmann | 2014-09-05 | 1 | -7/+5 |
| | |||||
* | work on passphrase caching, make use of cached SecretKeyType data (WIP!) | Vincent Breitmoser | 2014-09-03 | 1 | -23/+32 |
| | |||||
* | cache key s2k type in database, for later use | Vincent Breitmoser | 2014-09-02 | 1 | -0/+2 |
| |