Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' | Vincent Breitmoser | 2014-09-24 | 1 | -7/+12 |
|\ | | | | | | | | | 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 decryption | Dominik Schürmann | 2014-09-24 | 1 | -2/+7 |
| | | |||||
* | | fix signing in OK with yubikeys | Vincent Breitmoser | 2014-09-24 | 1 | -0/+11 |
|/ | |||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 1 | -40/+27 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -7/+6 |
| | | | | created ui.util for everything related to formatting | ||||
* | 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 | 1 | -6/+18 |
| | |||||
* | 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 | 1 | -2/+1 |
|/ | |||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -6/+6 |
| | |||||
* | pending results are a type of non-success | Vincent Breitmoser | 2014-09-14 | 1 | -2/+2 |
| | |||||
* | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 1 | -9/+5 |
| | |||||
* | Temporary fix for #848, fixed pull2refresh bugs | Daniel Albert | 2014-09-13 | 1 | -26/+26 |
| | |||||
* | working version of DecryptVerifyResult | Vincent Breitmoser | 2014-09-13 | 1 | -12/+26 |
| | |||||
* | introduce OperationResultParcel for PgpDecryptVerify operations (WIP) | Vincent Breitmoser | 2014-09-13 | 1 | -39/+15 |
| | |||||
* | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 1 | -7/+8 |
| | |||||
* | 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 |
| | |||||
* | Prepare Yubikey decryption | Dominik Schürmann | 2014-09-08 | 1 | -1/+2 |
| | |||||
* | remove broken(?) cancellation code | Vincent Breitmoser | 2014-09-01 | 1 | -29/+7 |
| | |||||
* | add cancel prevention mechanism, improve cancellation for key import | Vincent Breitmoser | 2014-08-31 | 1 | -2/+7 |
| | |||||
* | don't make our service sticky | Vincent Breitmoser | 2014-08-31 | 1 | -1/+1 |
| | |||||
* | add cancel support to edit key action | Vincent Breitmoser | 2014-08-31 | 1 | -7/+25 |
| | |||||
* | Add cancelable mechanism and support in key import | Vincent Breitmoser | 2014-08-31 | 1 | -2/+19 |
| | | | | Closes #323 | ||||
* | Change account type | Dominik Schürmann | 2014-08-21 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-21 | 1 | -0/+8 |
|\ | |||||
| * | Sync in KeychainIntentService on delete, import, save | Dominik Schürmann | 2014-08-20 | 1 | -0/+8 |
| | | |||||
* | | Copyright (C) 2014 Vincent Breitmoser | Vincent Breitmoser | 2014-08-21 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Vincent Breitmoser | 2014-08-20 | 1 | -2/+3 |
|\ | |||||
| * | Upload key working | Dominik Schürmann | 2014-08-20 | 1 | -2/+3 |
| | | |||||
* | | move key deletion into KeychainIntentHandler | Vincent Breitmoser | 2014-08-20 | 1 | -1/+49 |
|/ | |||||
* | Merge branch 'master' of github.com:open-keychain/open-keychain | Dominik Schürmann | 2014-08-20 | 1 | -3/+10 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | consolidate: implement (mostly) recovery mode | Vincent Breitmoser | 2014-08-20 | 1 | -3/+10 |
| | | |||||
* | | Fixes and temporary fixes for returning results | Dominik Schürmann | 2014-08-20 | 1 | -2/+0 |
|/ | |||||
* | consolidate: split into two steps, can pick up at second step if anything fails | Vincent Breitmoser | 2014-08-19 | 1 | -10/+3 |
| | |||||
* | consolidate: working implementation, lacking ui | Vincent Breitmoser | 2014-08-17 | 1 | -0/+15 |
| | |||||
* | parametrize FileImportCache for filename | Vincent Breitmoser | 2014-08-17 | 1 | -1/+1 |
| | |||||
* | Always return a SaveKeyringResult from saving | Dominik Schürmann | 2014-08-16 | 1 | -1/+6 |
| | |||||
* | Fix encrypt only | Dominik Schürmann | 2014-08-16 | 1 | -15/+19 |
| | |||||
* | handle modify and save errors in KeychainIntentResult | Vincent Breitmoser | 2014-08-14 | 1 | -8/+22 |
| | |||||
* | Remove support for v3 sig generation | Dominik Schürmann | 2014-08-14 | 1 | -1/+0 |
| | |||||
* | Dont write version header by default | Dominik Schürmann | 2014-08-14 | 1 | -1/+1 |
| | |||||
* | Better error handling for passphrase cache if key is missing | Dominik Schürmann | 2014-08-13 | 1 | -6/+14 |
| | |||||
* | Decrypt metadata api | Dominik Schürmann | 2014-08-11 | 1 | -1/+1 |
| | |||||
* | Get original filename for decryption | Dominik Schürmann | 2014-08-11 | 1 | -8/+73 |
| | |||||
* | Optimize imports | Dominik Schürmann | 2014-08-05 | 1 | -4/+1 |
| | |||||
* | Use size of input uris for progress bar in encrypt/decrypt | mar-v-in | 2014-08-04 | 1 | -2/+2 |
| |