877 Commits

Author	SHA1	Message	Date
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
Dominik Schürmann	0b07c5258f	Disable key import in sync adapter	2014-08-20 23:13:37 +02:00
Vincent Breitmoser	ce4bfdf945	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 23:09:25 +02:00
Vincent Breitmoser	9c9fc5330a	small change to make android studio recognize a honeycomb-only block	2014-08-20 23:09:20 +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
Dominik Schürmann	37caddca70	Upload key working	2014-08-20 22:51:00 +02:00
Vincent Breitmoser	945764b30f	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 22:38:28 +02:00
Dominik Schürmann	0f8958afb9	Upload key working	2014-08-20 22:17:16 +02:00
Vincent Breitmoser	dd1b27b28f	consolidate: small ui things	2014-08-20 21:52:54 +02:00
Vincent Breitmoser	6c428fa6b5	make number of secret keys imported part of ImportResult parcel	2014-08-20 21:51:57 +02:00
Vincent Breitmoser	9122d43d0a	close actionmode in keylist on loading events (avoid inconsistent state)	2014-08-20 21:51:19 +02:00
Dominik Schürmann	fa25265e79	Fix key sharing	2014-08-20 21:51:01 +02:00
Dominik Schürmann	e33e5b0003	Work on upload key	2014-08-20 21:44:51 +02:00
Vincent Breitmoser	6ed0f667cd	consolidate: remove debug "breakpoint"	2014-08-20 21:29:11 +02:00
Dominik Schürmann	45706e6534	Notify duration, cleanup	2014-08-20 21:09:46 +02:00
Dominik Schürmann	937c91eefa	Fix nullpointer in first time activity	2014-08-20 20:44:49 +02:00
Dominik Schürmann	ccc1d2e006	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 20:24:24 +02:00
Dominik Schürmann	735040e193	return some more results	2014-08-20 20:24:19 +02:00
Vincent Breitmoser	2cc265390c	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 20:16:05 +02:00
Vincent Breitmoser	c296529049	modifyKey: small logging changes	2014-08-20 20:15:43 +02:00
Dominik Schürmann	50c33ef322	progress dialog design fix	2014-08-20 20:13:25 +02:00
Dominik Schürmann	e13c3bd1ac	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 20:08:56 +02:00
Dominik Schürmann	47bcc6149e	return some more results	2014-08-20 20:08:51 +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
Vincent Breitmoser	9aaaac068e	consolidate: use KeychainProvider for deletion operation	2014-08-20 19:31:51 +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
mar-v-in	1a6734f29c	Fix mime types, #781	2014-08-19 18:54:48 +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	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