Commit Graph

25 Commits

Author SHA1 Message Date
Adithya Abraham Philip 93f3a98eae prevent keybase key replacing keyserver key 2015-05-31 02:49:11 +05:30
Adithya Abraham Philip 797cd28997 fixed sync on key import, 'me' linked contact crash 2015-05-08 19:05:21 +05:30
Vincent Breitmoser 91d500b20d check for fingerprint of any subkey (arguable?) 2015-05-06 11:26:01 +02:00
Dominik Schürmann 040cf42cb0 Merge branch 'development' into v/crypto-input-parcel
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
2015-03-24 13:19:43 +01:00
Adithya Abraham Philip 19775c399b introduced multi-threading
refactored oldKeys to updatedKeys

added update all keys, ThreadPoolExecutor

used modified CachedThreadPoolExecutor
2015-03-23 15:34:22 +05:30
Vincent Breitmoser 212bba1869 finish ui flow for yubikey import 2015-03-22 06:36:27 +01:00
Dominik Schürmann e45f000cb4 Remove advanced preferences, move compression as menu item in encrypt activites, select hash and encryption algo based on hardcoded preferred lists 2015-03-05 16:57:57 +01:00
Vincent Breitmoser 7b24ee7b55 rewrite PgpSignEncrypt data flow
- 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
2015-02-01 23:14:26 +01:00
Vincent Breitmoser 2bb7c3bcef move last parts of import logic from kis into operation 2015-01-26 16:33:10 +01:00
Vincent Breitmoser 8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Vincent Breitmoser 7223abcf0c extend canonicalize to strip local certificates on export 2015-01-02 00:07:05 +01:00
Vincent Breitmoser 1886dd1790 export secret and public keys in separate armored blocks 2014-10-31 18:18:09 +01:00
Vincent Breitmoser 7017527999 forgot a thing for secret key export 2014-10-30 15:14:44 +01:00
Vincent Breitmoser e1285eec7b Close stream on key export to avoid partial write (see #986) 2014-10-29 22:39:38 +01:00
Vincent Breitmoser 510ef40f55 implement upload of keyring after certification, check that option by default 2014-10-26 01:50:48 +02:00
Vincent Breitmoser b9c0504465 remove unnecessary (and buggy) BufferedInputStream wrapping 2014-10-25 22:20:55 +02:00
Vincent Breitmoser 7c4bbc83cb change indentation of import logs 2014-10-25 02:25:39 +02:00
Vincent Breitmoser ba724353e5 more work on import logging 2014-10-25 02:13:02 +02:00
Vincent Breitmoser 478b2a4d8b add logging to import and change order of import, keyservers first 2014-10-25 01:59:15 +02:00
Dominik Schürmann 9447f8fdf9 Fix import from cloud 2014-10-24 00:30:58 +02:00
Vincent Breitmoser 214b60cd00 integrate download from keyserver into key import operation 2014-10-23 23:29:40 +02:00
Vincent Breitmoser b6c7231a7f some cleanup and documentation of *Operation classes 2014-10-15 16:57:23 +02:00
Vincent Breitmoser e58ba0f4bb fix export performance problems 2014-10-14 14:19:54 +02:00
Vincent Breitmoser 815ed2e233 rewrite export with new operation style 2014-10-13 00:26:59 +02:00
Vincent Breitmoser fe981e5498 move around package structure a bit 2014-10-10 19:59:25 +02:00