97 Commits

Author	SHA1	Message	Date
Dominik Schürmann	d3c54d5f12	Fallback if no primary user id exists	2014-07-16 00:22:45 +02:00
Vincent Breitmoser	64b87f75be	move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)	2014-07-15 19:47:52 +02:00
Dominik Schürmann	503b146a14	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-15 19:22:44 +02:00
Dominik Schürmann	72237a0892	some fixes for edit	2014-07-15 19:22:40 +02:00
Vincent Breitmoser	29145e49c9	merge: different msg if nothing was merged	2014-07-15 19:17:08 +02:00
Vincent Breitmoser	e477577c55	some UncachedKeyRing fixes, primary user id mostly	2014-07-11 02:50:35 +02:00
Vincent Breitmoser	287b74885e	don't use zero plural string for english ... closes #703	2014-07-02 14:51:11 +02:00
Vincent Breitmoser	6d7a9ec48a	pass import results through to viewkeyactivity on update	2014-06-28 20:54:14 +02:00
Vincent Breitmoser	d6a2875816	code cleanup and plurals in import log entries ... closes #698	2014-06-28 19:15:28 +02:00
Vincent Breitmoser	37cee1322b	fix indentation in various key import methods	2014-06-22 14:17:08 +02:00
Art O Cathain	0af2b27cb3	VERY basic test for save keyring	2014-06-21 17:44:04 +01:00
Vincent Breitmoser	3bffe4da55	generate public keyring from secret if not available	2014-06-18 20:55:44 +02:00
Vincent Breitmoser	f8d895dea4	consolidate: almost sane logging	2014-06-18 20:27:59 +02:00
Vincent Breitmoser	134f8471c0	consolidate: add key import routines with consolidation	2014-06-18 19:39:16 +02:00
Vincent Breitmoser	f80228a08d	consolidate: make it work	2014-06-18 14:02:21 +02:00
Vincent Breitmoser	1e45e5cd9a	code cleanup in ProviderHelper and UncachedKeyRing	2014-06-18 10:00:21 +02:00
Vincent Breitmoser	d8b0015d25	consolidate: add logging	2014-06-18 00:30:45 +02:00
Vincent Breitmoser	b4974d922e	consolidate: first draft	2014-06-18 00:30:45 +02:00
Vincent Breitmoser	adf15d4d16	import-log: don't count self certs as unknown	2014-06-18 00:25:52 +02:00
Vincent Breitmoser	c63f3c8a5d	prepare ProviderHelper for consolidation before insert	2014-06-18 00:21:11 +02:00
Vincent Breitmoser	0013199b2d	handle database error on secret key insert	2014-06-17 23:46:02 +02:00
Vincent Breitmoser	6e4d0dede1	canonicalize: support secret keys	2014-06-17 23:25:45 +02:00
Vincent Breitmoser	02fbaaf858	import-log: clean up progress messages	2014-06-17 12:18:41 +02:00
Vincent Breitmoser	ffea551afc	drop invalid user ids and add fatal case(s)	2014-06-16 22:32:17 +02:00
Vincent Breitmoser	2f0e70587d	add more progress info from import routine	2014-06-16 22:00:57 +02:00
Vincent Breitmoser	109bea7542	import-log: distinguish master/subkeys, distinguish redundant/bad certs, more docs	2014-06-16 22:00:57 +02:00
Vincent Breitmoser	79131be5f0	canonicalize: simplify import with info from canonicalization	2014-06-12 22:27:32 +02:00
Vincent Breitmoser	9dd40b7238	import-log: more minor improvements	2014-06-12 21:12:21 +02:00
Vincent Breitmoser	59701250ba	import: use wrapped keyring instead of uncached keyring for trust	2014-06-12 18:11:31 +02:00
Vincent Breitmoser	e4a7d4f6e5	import-log: minor improvements	2014-06-12 18:10:48 +02:00
Vincent Breitmoser	466eddb005	canonicalize: implementation, first draft	2014-06-12 15:47:21 +02:00
Vincent Breitmoser	dea98a4a7e	import-log: properly distinguish return states	2014-06-12 12:36:58 +02:00
Vincent Breitmoser	47368f1d24	import-log: better way to check self trust, and fix log level filtering	2014-06-12 01:37:49 +02:00
Vincent Breitmoser	3895c10a58	import-log: work on log fragment ui	2014-06-10 20:06:28 +02:00
Vincent Breitmoser	f38556cab1	import-log: switch to flags instead of statuses for result int	2014-06-10 16:24:04 +02:00
Vincent Breitmoser	e41e6ea0de	import-log: more interface work	2014-06-10 15:27:26 +02:00
Vincent Breitmoser	067ffa876d	import-log: add OperationResults, use it in ImportKeys operation	2014-06-10 01:31:28 +02:00
Vincent Breitmoser	c36b311d5f	import-log: better stripped key logging	2014-06-06 17:29:39 +02:00
Vincent Breitmoser	118225d7d2	import-log: add output to logcat (for debugging)	2014-06-06 17:28:36 +02:00
Vincent Breitmoser	787f6edf32	import-log: add log statements in import routine	2014-06-06 16:15:27 +02:00
Vincent Breitmoser	b995b836a3	import-log: improve operationresultparcel, add indentation	2014-06-06 16:14:15 +02:00
Vincent Breitmoser	36bc0ae676	fix bug with bad verifying master keys	2014-06-04 21:35:36 +02:00
Vincent Breitmoser	cc1e4dce0a	neatness refactoring	2014-06-04 20:27:25 +02:00
Vincent Breitmoser	58edc0af67	wrapped-key-ring: add documentation	2014-06-02 13:49:11 +02:00
Vincent Breitmoser	d891f75339	make everything work again	2014-06-02 13:47:48 +02:00
Vincent Breitmoser	ed8b62c32b	wrapped-key-ring: no UncachedSecretKeyRing after all	2014-06-02 13:47:48 +02:00
Vincent Breitmoser	a53da491c0	new savekeyring operation (mostly stub)	2014-05-27 13:56:30 +02:00
Vincent Breitmoser	10ad7be46b	wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type	2014-05-23 16:44:50 +02:00
Vincent Breitmoser	6d7daec37f	wrapped-key-ring: use CachedKeyRing where possible	2014-05-21 21:41:51 +02:00
Vincent Breitmoser	ab6c47a9b3	use long rather than String to build uris by key	2014-05-21 21:26:35 +02:00