416 Commits

Author	SHA1	Message	Date
Dominik Schürmann	b7de91ad51	Disable custom intent chooser	2014-08-21 14:07:37 +02:00
Dominik Schürmann	562e379c56	Fix nullpointer when revoking keys	2014-08-21 11:40:48 +02:00
Dominik Schürmann	d1ef355f55	Fix result handling in account settings	2014-08-21 00:29:49 +02:00
Vincent Breitmoser	63ca81d871	Copyright (C) 2014 Vincent Breitmoser	2014-08-21 00:02:27 +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
Vincent Breitmoser	945764b30f	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-20 22:38:28 +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	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	735040e193	return some more results	2014-08-20 20:24:19 +02:00
Dominik Schürmann	50c33ef322	progress dialog design fix	2014-08-20 20:13:25 +02:00
Dominik Schürmann	47bcc6149e	return some more results	2014-08-20 20:08:51 +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	fe1f5489ff	consolidate: implement (mostly) recovery mode	2014-08-20 19:34:36 +02:00
mar-v-in	1a6734f29c	Fix mime types, #781	2014-08-19 18:54: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	a2ae318a1a	add OpenDialogActivity (stub)	2014-08-19 15:55:40 +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
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	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
Vincent Breitmoser	09d37a5fa6	fix keys with no expiry in ui code	2014-08-14 22:12:18 +02:00
Dominik Schürmann	0f60bcbc3d	Pass through of master key id in SaveKeyringResult	2014-08-14 19:25:39 +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
Dominik Schürmann	a58440b85d	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-08-14 18:51:44 +02:00
Dominik Schürmann	65e76f6e44	hacky fix to prevent key list from scrolling to top when opening nav drawer	2014-08-14 18:51:35 +02:00
mar-v-in	e1958009bd	Do not allow self certifying	2014-08-14 18:10:22 +02:00
Vincent Breitmoser	9af301ec77	handle modify and save errors in KeychainIntentResult	2014-08-14 17:12:17 +02:00
mar-v-in	eebd480e8d	Fix KeySpinner on cursor change	2014-08-14 16:14:16 +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	07d6a26778	add OnKeyChangedListener to KeySpinner	2014-08-14 16:02:27 +02:00
mar-v-in	ef2449917e	factor KeySpinner out	2014-08-14 16:02:27 +02:00
Dominik Schürmann	225e248293	Remove MD5 support	2014-08-14 15:30:08 +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	38da2af0e8	Better error handling for passphrase cache if key is missing	2014-08-13 16:37:28 +02:00