366 Commits

Author	SHA1	Message	Date
Dominik Schürmann	f0ff8d2222	Add sync properties	2014-08-21 11:25:41 +02:00
Dominik Schürmann	2930f83b2a	Change account type	2014-08-21 11:19:44 +02:00
Dominik Schürmann	7adf07a9f9	XML cleanup	2014-08-21 10:47:29 +02:00
Dominik Schürmann	41052d6f8f	Pull from transifex	2014-08-21 00:36:15 +02:00
Dominik Schürmann	642a63fab6	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 23:26:09 +02:00
Dominik Schürmann	418e922c78	Enable sync adapter, changelog	2014-08-20 23:26:01 +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	1e5ac82985	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 19:59:54 +02:00
Vincent Breitmoser	475293a116	consolidate: prevent concurrent calls of step 2	2014-08-20 19:59:45 +02:00
Dominik Schürmann	0e152d1db0	Merge branch 'master' of github.com:open-keychain/open-keychain ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java	2014-08-20 19:48:19 +02:00
Dominik Schürmann	f46f2b6895	Fixes and temporary fixes for returning results	2014-08-20 19:46:44 +02:00
Vincent Breitmoser	2a96912a96	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 19:34:42 +02:00
Vincent Breitmoser	fe1f5489ff	consolidate: implement (mostly) recovery mode	2014-08-20 19:34:36 +02:00
Dominik Schürmann	c3b12bb3c2	Pull from transifex	2014-08-20 18:30:22 +02:00
Dominik Schürmann	70426041df	Pull from transifex	2014-08-20 11:09:41 +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
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	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	c1a265bfd1	certs header design	2014-08-19 10:01:31 +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
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	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	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
Dominik Schürmann	28df004cbb	Merge pull request #767 from mar-v-in/issue-763 ... Use dropdown in CertifyActivity	2014-08-14 18:53:40 +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	9ad09a3982	Automcomplete names and emails in keyserver tab	2014-08-14 16:12:42 +02:00
mar-v-in	a6118877ff	Add and use CertifyKeySpinner	2014-08-14 16:02:28 +02:00
mar-v-in	ef2449917e	factor KeySpinner out	2014-08-14 16:02:27 +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	c7d5b09286	Move certify action down into actions section	2014-08-13 21:23:01 +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	65fd0de7e1	passphrase instead of pass phrase	2014-08-07 11:17:58 +02:00