Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | split import and export ops | Adithya Abraham Philip | 2015-06-27 | 1 | -873/+0 |
| | |||||
* | added export and upload to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -5/+41 |
| | |||||
* | introduced CryptoOperationHelper in ImportKeysActivity | Adithya Abraham Philip | 2015-06-27 | 1 | -15/+259 |
| | |||||
* | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -6/+10 |
| | |||||
* | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 1 | -1/+1 |
| | |||||
* | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -3/+10 |
| | |||||
* | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 1 | -12/+11 |
| | |||||
* | fixed sync on key import, 'me' linked contact crash | Adithya Abraham Philip | 2015-05-08 | 1 | -0/+2 |
| | |||||
* | check for fingerprint of any subkey (arguable?) | Vincent Breitmoser | 2015-05-06 | 1 | -6/+7 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -9/+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 | ||||
| * | introduced multi-threading | Adithya Abraham Philip | 2015-03-23 | 1 | -9/+11 |
| | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor | ||||
* | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 1 | -1/+1 |
|/ | |||||
* | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 1 | -8/+0 |
| | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -4/+4 |
| | | | | | | | - 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 | ||||
* | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 1 | -3/+45 |
| | |||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -1/+1 |
| | |||||
* | extend canonicalize to strip local certificates on export | Vincent Breitmoser | 2015-01-02 | 1 | -8/+19 |
| | |||||
* | export secret and public keys in separate armored blocks | Vincent Breitmoser | 2014-10-31 | 1 | -9/+24 |
| | |||||
* | forgot a thing for secret key export | Vincent Breitmoser | 2014-10-30 | 1 | -18/+24 |
| | |||||
* | Close stream on key export to avoid partial write (see #986) | Vincent Breitmoser | 2014-10-29 | 1 | -0/+7 |
| | |||||
* | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 1 | -0/+4 |
| | |||||
* | remove unnecessary (and buggy) BufferedInputStream wrapping | Vincent Breitmoser | 2014-10-25 | 1 | -3/+10 |
| | |||||
* | change indentation of import logs | Vincent Breitmoser | 2014-10-25 | 1 | -10/+10 |
| | |||||
* | more work on import logging | Vincent Breitmoser | 2014-10-25 | 1 | -1/+2 |
| | |||||
* | add logging to import and change order of import, keyservers first | Vincent Breitmoser | 2014-10-25 | 1 | -23/+38 |
| | |||||
* | Fix import from cloud | Dominik Schürmann | 2014-10-24 | 1 | -1/+1 |
| | |||||
* | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 1 | -6/+81 |
| | |||||
* | some cleanup and documentation of *Operation classes | Vincent Breitmoser | 2014-10-15 | 1 | -1/+18 |
| | |||||
* | fix export performance problems | Vincent Breitmoser | 2014-10-14 | 1 | -0/+5 |
| | |||||
* | rewrite export with new operation style | Vincent Breitmoser | 2014-10-13 | 1 | -68/+170 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -0/+279 |