Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -3/+5 |
| | |||||
* | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 1 | -25/+14 |
| | |||||
* | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 1 | -5/+4 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -11/+11 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | ||||
| * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -218/+35 |
| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
| * | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -26/+209 |
| | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | ||||
* | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 1 | -2/+3 |
| | | |||||
* | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 1 | -1/+1 |
| | | |||||
* | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -2/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | ||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 1 | -3/+4 |
| | | |||||
* | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -2/+4 |
|/ | |||||
* | Fixed possible ArrayIndexOutOfBoundsException. | danielnelz | 2015-03-11 | 1 | -1/+1 |
| | |||||
* | Added braces to if else. | danielnelz | 2015-03-09 | 1 | -2/+3 |
| | |||||
* | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 1 | -38/+54 |
| | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
* | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 1 | -9/+146 |
|\ | |||||
| * | Add check that proof & database fingerprints are the same | Tim Bray | 2014-11-21 | 1 | -3/+6 |
| | | |||||
| * | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 1 | -15/+10 |
| |\ | |||||
| * | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵ | Tim Bray | 2014-11-19 | 1 | -1/+7 |
| | | | | | | | | | | | | gracefully. Fixes #1007 & #1008. | ||||
| * | | All keybase proofs now in place | Tim Bray | 2014-11-11 | 1 | -5/+33 |
| | | | |||||
| * | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -20/+113 |
| | | | |||||
* | | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -151/+24 |
| | | | | | | | | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
* | | | Fix cleartext signatures internally | Dominik Schürmann | 2015-01-27 | 1 | -5/+4 |
| | | | |||||
* | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 1 | -38/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 1 | -38/+17 |
| | | | | |||||
* | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 1 | -213/+246 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| * | | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -225/+242 |
| | | | | |||||
| * | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 1 | -0/+20 |
| | | | | |||||
* | | | | Experimental API support for detached signatures (not tested) | Dominik Schürmann | 2015-01-08 | 1 | -2/+1 |
|/ / / | |||||
* | | | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 1 | -85/+11 |
| | | | |||||
* | | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 1 | -3/+8 |
| |/ |/| | | | | | capabilities | ||||
* | | more cleanup | Dominik Schürmann | 2014-11-21 | 1 | -14/+9 |
| | | |||||
* | | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 1 | -1/+1 |
|/ | |||||
* | 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 |
| | |||||
* | 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 | 1 | -13/+12 |
| | |||||
* | move operations into ops package, introduce BaseOperation class | Vincent Breitmoser | 2014-10-10 | 1 | -9/+9 |
| | |||||
* | Replace many PgpGeneralExceptions with PgpKeyNotFoundException | Dominik Schürmann | 2014-10-09 | 1 | -1/+2 |
| | |||||
* | 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 |
| | |||||
* | automatically extend single compound entry logs | Vincent Breitmoser | 2014-10-08 | 1 | -14/+5 |
| | |||||
* | qr code download, cleanup | Dominik Schürmann | 2014-10-04 | 1 | -1/+1 |
| |