362 Commits

Author	SHA1	Message	Date
Dominik Schürmann	0c437acd43	Catch security exception, known problem...	2014-09-02 13:51:09 +02:00
Vincent Breitmoser	e0905a3afb	cache key s2k type in database, for later use	2014-09-02 01:24:16 +02:00
Vincent Breitmoser	2ead78a1e5	split EncryptActivity into Encrypt{Text,File}Activity	2014-09-01 23:25:03 +02:00
Vincent Breitmoser	e26d7be7de	remove "sign" and "verify" from drawer texts	2014-09-01 22:07:14 +02:00
Vincent Breitmoser	6b5e65253c	small ui changes in encrypt	2014-09-01 21:43:15 +02:00
Vincent Breitmoser	6a3e7921cf	remove "by holding..." explanation from button text	2014-09-01 21:24:24 +02:00
Dominik Schürmann	42acb12059	Fix transifex linebreaks by adding apostrophs to strings with linebreaks	2014-09-01 16:00:50 +02:00
Dominik Schürmann	40e6b24b14	Prepare API for OpenPgpSignatureResult extensions	2014-08-31 23:50:04 +02:00
Dominik Schürmann	bdf0436c94	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-31 20:26:12 +02:00
Dominik Schürmann	5e7eed239f	Better leyout for account settings	2014-08-31 20:26:06 +02:00
Vincent Breitmoser	e46bc24079	add cancel support to edit key action	2014-08-31 19:20:08 +02:00
Vincent Breitmoser	7da7832284	Add cancelable mechanism and support in key import ... Closes #323	2014-08-31 17:32:13 +02:00
Vincent Breitmoser	5ff3043903	canonicalize: add check for algorithm type ... closes #797	2014-08-30 17:00:58 +02:00
Dominik Schürmann	b193965e58	Merge pull request #796 from open-keychain/develop ... ECC support	2014-08-28 10:46:58 +02:00
Dominik Schürmann	c2f6aa09c5	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-27 19:28:46 +02:00
Dominik Schürmann	d795f8d4e2	Strip out duplicate user ids	2014-08-27 19:28:33 +02:00
Vincent Breitmoser	cb2eb8aca2	small language fixes for previous commit	2014-08-27 15:42:09 +02:00
Dominik Schürmann	12a5b2174f	Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696	2014-08-27 14:12:59 +02:00
Dominik Schürmann	86a05033ae	Cleanup FoldableLinearLayout	2014-08-27 13:54:33 +02:00
Vincent Breitmoser	783dae8804	add ecc support	2014-08-24 16:08:37 +02:00
Dominik Schürmann	3acbe9052f	Add ECDH and ECDSA values	2014-08-21 15:40:09 +02:00
Dominik Schürmann	642a63fab6	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 23:26:09 +02:00
Vincent Breitmoser	dcf268bcb2	move key deletion into KeychainIntentHandler	2014-08-20 23:08:52 +02:00
Dominik Schürmann	e8bc9083f2	improve certs_text	2014-08-20 23:01:27 +02:00
Vincent Breitmoser	dd1b27b28f	consolidate: small ui things	2014-08-20 21:52:54 +02:00
Vincent Breitmoser	c296529049	modifyKey: small logging changes	2014-08-20 20:15:43 +02:00
Vincent Breitmoser	475293a116	consolidate: prevent concurrent calls of step 2	2014-08-20 19:59:45 +02:00
Vincent Breitmoser	fe1f5489ff	consolidate: implement (mostly) recovery mode	2014-08-20 19:34:36 +02:00
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
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	638c29792d	Header for certs view	2014-08-19 09:52:15 +02:00
Dominik Schürmann	a5d34478df	Add subkey: at least one flag should be selected!	2014-08-18 11:13:52 +02:00
Vincent Breitmoser	14290c3ce9	consolidate: working implementation, lacking ui	2014-08-17 03:29:03 +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	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
Vincent Breitmoser	a19784ed7e	merge: check fingerprints on merge operation! (this needs a testcase!)	2014-08-14 16:28:03 +02:00
Dominik Schürmann	05da0f4328	change keybase hint following pull request #755	2014-08-14 16:20:24 +02:00
Dominik Schürmann	62f7bf6215	move v3 key import prevention into canonicalization method	2014-08-14 15:58:26 +02:00
Dominik Schürmann	0a1de8deea	Do not import v3 keys, they are insecure!	2014-08-14 15:42:02 +02:00
Dominik Schürmann	e72e47d92e	Remove support for v3 sig generation	2014-08-14 15:24:37 +02:00
Dominik Schürmann	d0987edab9	Dont write version header by default	2014-08-14 11:44:47 +02:00
Dominik Schürmann	f941431d63	Add user info dialog	2014-08-13 21:49:04 +02:00
Dominik Schürmann	db12f782f2	API: User interaction when account keys are deleted	2014-08-13 18:48:42 +02:00
Dominik Schürmann	a908c7de67	Readd missing string	2014-08-07 10:01:42 +02:00
Dominik Schürmann	e4974ac409	Use CompressionAlgorithmTags instead of homebrew constants	2014-08-05 23:50:59 +02:00