Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 1 | -2/+6 |
| | |||||
* | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 1 | -1/+2 |
| | |||||
* | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 1 | -77/+8 |
| | |||||
* | some cleanup and documentation of *Operation classes | Vincent Breitmoser | 2014-10-15 | 1 | -3/+0 |
| | |||||
* | fix test for new PgpDecryptVerify | Vincent Breitmoser | 2014-10-14 | 1 | -1/+3 |
| | |||||
* | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation | Vincent Breitmoser | 2014-10-13 | 1 | -35/+7 |
| | |||||
* | remove DELETE_FILE_SECURELY | Vincent Breitmoser | 2014-10-13 | 1 | -23/+0 |
| | | | | closes #961 | ||||
* | rewrite export with new operation style | Vincent Breitmoser | 2014-10-13 | 1 | -61/+20 |
| | |||||
* | CertifyOperation is not a Pgp- operation | Vincent Breitmoser | 2014-10-12 | 1 | -23/+13 |
| | |||||
* | move delete into operation class | Vincent Breitmoser | 2014-10-11 | 1 | -32/+7 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 11 | -1672/+12 |
| | |||||
* | move operations into ops package, introduce BaseOperation class | Vincent Breitmoser | 2014-10-10 | 1 | -9/+9 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2014-10-09 | 2 | -4/+5 |
|\ | |||||
| * | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 2 | -4/+5 |
| | | |||||
| * | Revert "Replace PgpGeneralException with NotFoundException where appropriate" | Dominik Schürmann | 2014-10-09 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385. | ||||
| * | Replace PgpGeneralException with NotFoundException where appropriate | Dominik Schürmann | 2014-10-09 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2014-10-09 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | fix plurals quantity string in ImportKeyResult | Vincent Breitmoser | 2014-10-04 | 1 | -1/+1 |
| | | |||||
* | | automatically extend single compound entry logs | Vincent Breitmoser | 2014-10-08 | 2 | -14/+14 |
| | | |||||
* | | use sub results in import | Vincent Breitmoser | 2014-10-05 | 1 | -1/+8 |
| | | |||||
* | | add support for hierarchical log entries | Vincent Breitmoser | 2014-10-05 | 1 | -3/+54 |
| | | |||||
* | | Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain ↵ | Vincent Breitmoser | 2014-10-04 | 4 | -6/+87 |
|\ \ | | | | | | | | | | into jacobshack-certify | ||||
| * | | qr code download, cleanup | Dominik Schürmann | 2014-10-04 | 1 | -1/+1 |
| | | | |||||
| * | | Workings on new parcel for key downloads | Dominik Schürmann | 2014-10-04 | 2 | -2/+74 |
| | | | |||||
| * | | Pass imported master key ids via result parcel | Dominik Schürmann | 2014-10-04 | 1 | -3/+12 |
| | | | |||||
* | | | certify: get rid of fingerprint check | Vincent Breitmoser | 2014-10-04 | 2 | -6/+3 |
|/ / | | | | | | | | | | | Master key ids are unambiguous by database design, and only keys which are in the database are signed. There is no reason to check the fingerprint again during the certify operation. | ||||
* | | improve CertifyResult, add custom notify | Vincent Breitmoser | 2014-10-04 | 3 | -2/+97 |
| | | |||||
* | | redesign certify action to work with parcel input and result | Vincent Breitmoser | 2014-10-04 | 4 | -24/+196 |
| | | |||||
* | | keychainintentservice: rearrange actions in alphabetical order | Vincent Breitmoser | 2014-10-04 | 1 | -263/+281 |
|/ | |||||
* | Fix string reference | Dominik Schürmann | 2014-10-03 | 1 | -1/+1 |
| | |||||
* | move IteratorWithSize interface into ParcelableFileCache - much cleaner | Vincent Breitmoser | 2014-10-03 | 1 | -2/+4 |
| | |||||
* | get rid of two consolidate number preferences | Vincent Breitmoser | 2014-10-03 | 1 | -1/+0 |
| | |||||
* | use iterator interface exclusively in ParcelableFileCache | Vincent Breitmoser | 2014-10-03 | 1 | -4/+9 |
| | |||||
* | make getSignId a secret key operation, and respect unavailable keys | Vincent Breitmoser | 2014-10-02 | 1 | -1/+1 |
| | | | | This one should remedy #811, but waiting for a test | ||||
* | mProgressDialogFragment null check | Dominik Schürmann | 2014-10-02 | 1 | -0/+5 |
| | |||||
* | More debugging output | Dominik Schürmann | 2014-10-01 | 1 | -1/+1 |
| | |||||
* | pass (encryption) key id from Decrypt*Fragment to NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -1/+7 |
| | |||||
* | pass key id for check from EncryptActivity to NfcActivity | Vincent Breitmoser | 2014-09-30 | 1 | -1/+7 |
| | |||||
* | be more mindful of algorithm and usage flag interaction | Vincent Breitmoser | 2014-09-28 | 1 | -0/+2 |
| | | | | Fixes #895 | ||||
* | 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 |