734 Commits

Author	SHA1	Message	Date
Dominik Schürmann	16ab761006	Fix strings	2014-08-19 18:12:19 +02:00
Vincent Breitmoser	9930ab7f6f	consolidate: a lot more log output, better recovery	2014-08-19 16:53:55 +02:00
Dominik Schürmann	c42f6a04ed	Start consolidate activity	2014-08-19 16:49:48 +02:00
Dominik Schürmann	4f8ddad9d3	ConsolidateDialogActivity	2014-08-19 16:40:57 +02:00
Dominik Schürmann	4be8c36b43	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-19 16:31:59 +02:00
Dominik Schürmann	5f8bbab569	Scroll fixes for certify activity	2014-08-19 16:31:51 +02:00
Vincent Breitmoser	9fb1050fed	stub for consolidate recovery in KeychainApplication	2014-08-19 15:56:53 +02:00
Vincent Breitmoser	0422d48b61	add ProgressFixedScaler (forgot in a previous commit)	2014-08-19 15:55:53 +02:00
Vincent Breitmoser	a2ae318a1a	add OpenDialogActivity (stub)	2014-08-19 15:55:40 +02:00
Vincent Breitmoser	c725239a69	consolidate: split into two steps, can pick up at second step if anything fails	2014-08-19 15:45:59 +02:00
Dominik Schürmann	8d668d170c	Notes about criticality	2014-08-19 15:23:37 +02:00
Dominik Schürmann	9474749be1	Decrease iteration count, delayed for 2.9	2014-08-19 14:51:28 +02:00
Dominik Schürmann	26e82afa8e	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-19 14:46:15 +02:00
Vincent Breitmoser	6a3150d878	fix primary user id in master key flag modification	2014-08-19 14:42:40 +02:00
Dominik Schürmann	c1d05d0ee9	Change criticallity of subpackets after discussion	2014-08-19 14:16:46 +02:00
Dominik Schürmann	4a280f6ba3	Use higher s2k count	2014-08-19 11:11:58 +02:00
Dominik Schürmann	d131693bb8	Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible	2014-08-19 10:58:38 +02:00
Dominik Schürmann	b1bde6ead9	Mark packets critical	2014-08-19 10:42:35 +02:00
Dominik Schürmann	2c8bcffff3	add feature to key sig subpacket to indicate that we want MDC	2014-08-19 10:37:27 +02:00
Dominik Schürmann	a2b3824556	New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering	2014-08-19 10:30:44 +02:00
Dominik Schürmann	6ffdafc0e6	Add license headers	2014-08-19 10:01:39 +02:00
Dominik Schürmann	a5d34478df	Add subkey: at least one flag should be selected!	2014-08-18 11:13:52 +02:00
Dominik Schürmann	3e7ce0008f	Fixes for expiry UI	2014-08-18 11:02:41 +02:00
Vincent	56fb822034	Merge pull request #772 from mar-v-in/issue-729 ... Remove NoSwipeWrapContentViewPager	2014-08-17 15:46:27 +02:00
mar-v-in	57b2440731	Work-around rendering bug when switching back to asymmetric with multiple recipients selected	2014-08-17 11:31:41 +02:00
mar-v-in	3cc57a092a	Remove NoSwipeWrapContentViewPager	2014-08-17 11:07:34 +02:00
Vincent Breitmoser	14290c3ce9	consolidate: working implementation, lacking ui	2014-08-17 03:29:03 +02:00
Vincent Breitmoser	aa625d4fbf	parametrize FileImportCache for filename	2014-08-17 00:49:14 +02:00
Vincent Breitmoser	c00343d516	modify*Key: improve handling of passphrase modification (add tests, too)	2014-08-16 21:04:43 +02:00
Vincent Breitmoser	e38f6a2a46	use correct algorithm for signatures (actually fix heterogeneous subkeys)	2014-08-16 19:45:14 +02:00
Vincent Breitmoser	62b7d2d7d8	fix small log format string mistake for adding subkeys ... closes #768	2014-08-16 19:31:26 +02:00
Dominik Schürmann	f206902002	Fixing date picker issues	2014-08-16 16:17:46 +02:00
Dominik Schürmann	ccf58a92fa	Fix flags UI in add subkey dialog	2014-08-16 13:42:55 +02:00
Dominik Schürmann	c1f9c5e4b5	Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master key	2014-08-16 13:30:13 +02:00
Dominik Schürmann	4d698c896a	Fix expiry when adding subkeys	2014-08-16 12:28:49 +02:00
Dominik Schürmann	474fc50b80	Always return a SaveKeyringResult from saving	2014-08-16 12:24:46 +02:00
Dominik Schürmann	188eeb79c9	Fix and simplify in OperationResultParcel	2014-08-16 12:13:30 +02:00
Vincent Breitmoser	2497722b48	fix travis tests (more), minor comment edits	2014-08-16 07:12:37 +02:00
Vincent Breitmoser	7c7ba21714	tests: add test for master key revocation	2014-08-16 07:06:07 +02:00
Vincent Breitmoser	6e84c72801	tests: more expected error types	2014-08-16 06:53:50 +02:00
Vincent Breitmoser	de0d95432e	typed expected failures and a couple minor things	2014-08-16 06:53:50 +02:00
Vincent Breitmoser	a943bebfdf	support for master key modifications, among other stuff	2014-08-16 06:53:50 +02:00
Vincent Breitmoser	1fa77d57d2	modifySecretKey: err out on "use previous" expiry date for (sub)key creation	2014-08-16 06:53:50 +02:00
Vincent Breitmoser	c54fe21f44	modifySecretKey: err out on revocation of nonexistent user id	2014-08-16 06:53:50 +02:00
Dominik Schürmann	bbe986743c	API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables	2014-08-16 05:28:51 +02:00
Dominik Schürmann	443170b876	do not pre-select revoked or expired keys	2014-08-16 04:11:39 +02:00
Dominik Schürmann	8d60d9f103	Fix encrypt only	2014-08-16 03:59:58 +02:00
Dominik Schürmann	b1dc663930	Remove old_apg	2014-08-15 11:07:21 +02:00
Dominik Schürmann	b1fa5d9922	Remove subkeys.pgp.net keyserver from defaults	2014-08-15 11:00:45 +02:00
Dominik Schürmann	2c2860e86d	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-15 10:19:51 +02:00