1204 Commits

Author	SHA1	Message	Date
Dominik Schürmann	74bac3ea36	Remove empty layout	2014-10-25 23:36:48 +02:00
Dominik Schürmann	94e7bbb67b	Remove PassphraseDialogFragment	2014-10-25 22:56:27 +02:00
Dominik Schürmann	ad60ec2d00	Remove old certify activity	2014-10-25 22:55:16 +02:00
Dominik Schürmann	c1ef9ed149	Use passphrase dialog activity instead of passphrase dialog	2014-10-25 22:53:35 +02:00
Dominik Schürmann	1099382250	Remove old exception handling code from loaders	2014-10-25 22:31:28 +02:00
Dominik Schürmann	8dddc82f69	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 22:25:14 +02:00
Dominik Schürmann	4f37c88ea7	Fix color in import list	2014-10-25 22:25:11 +02:00
Vincent Breitmoser	b9c0504465	remove unnecessary (and buggy) BufferedInputStream wrapping	2014-10-25 22:20:55 +02:00
Dominik Schürmann	c2e7c2416f	Remove tabs from import keys activity	2014-10-25 22:05:55 +02:00
Dominik Schürmann	71e3fb5380	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 21:15:12 +02:00
Dominik Schürmann	0abfff0b0e	Fixes and icons for apps list, also add Password Store	2014-10-25 21:15:05 +02:00
Vincent Breitmoser	ce4b8edaab	more rewording	2014-10-25 03:18:54 +02:00
Dominik Schürmann	d3e0e823e3	Fix result passing	2014-10-25 03:06:39 +02:00
Dominik Schürmann	e11df08ea1	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 02:57:42 +02:00
Dominik Schürmann	339b283df5	Safeslinger fixesÄ	2014-10-25 02:57:33 +02:00
Vincent Breitmoser	748049fb5b	slightly change wording in merge logs	2014-10-25 02:50:48 +02:00
Vincent Breitmoser	c5028dc9ce	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 02:49:37 +02:00
Vincent Breitmoser	30d0afa363	change the way merging is logged	2014-10-25 02:45:16 +02:00
Dominik Schürmann	49b237d609	Fix safe slinger button	2014-10-25 02:42:13 +02:00
Dominik Schürmann	418f0970ab	Fix safe slinger button	2014-10-25 02:41:20 +02:00
Dominik Schürmann	57a26a6cb3	Use selected number of users in safe slinger	2014-10-25 02:39:48 +02:00
Dominik Schürmann	e332c664cf	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-25 02:38:09 +02:00
Dominik Schürmann	33b54ab03e	Safe slinger activity preps	2014-10-25 02:38:06 +02:00
Vincent Breitmoser	7c4bbc83cb	change indentation of import logs	2014-10-25 02:25:39 +02:00
Vincent Breitmoser	059c058040	set padding for sublog entries	2014-10-25 02:25:28 +02:00
Vincent Breitmoser	ba724353e5	more work on import logging	2014-10-25 02:13:02 +02:00
Vincent Breitmoser	478b2a4d8b	add logging to import and change order of import, keyservers first	2014-10-25 01:59:15 +02:00
Dominik Schürmann	9447f8fdf9	Fix import from cloud	2014-10-24 00:30:58 +02:00
Dominik Schürmann	bfc3774f02	Merge pull request #973 from timbray/development ... Make the Certify screen a little more self-explanatory	2014-10-24 00:23:40 +02:00
Dominik Schürmann	efa5a80eb6	Merge branch 'development' of github.com:open-keychain/open-keychain into development ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java	2014-10-23 23:33:50 +02:00
Dominik Schürmann	1624cd8349	Start safe slinger activity	2014-10-23 23:31:50 +02:00
Vincent Breitmoser	76a1e99d7e	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-23 23:31:28 +02:00
Vincent Breitmoser	214b60cd00	integrate download from keyserver into key import operation	2014-10-23 23:29:40 +02:00
Dominik Schürmann	e494beb58a	Externalize QR Code scanning and import into its own activity for better code separation	2014-10-23 17:13:49 +02:00
Dominik Schürmann	ecfa2288eb	Fix crash on Android 5	2014-10-22 23:28:13 +02:00
Tim Bray	0516b80c07	Make the Certify screen a little more self-explanatory	2014-10-21 11:35:03 -07:00
Dominik Schürmann	f4f16e62a2	consistency for import UI	2014-10-16 14:47:36 +02:00
Dominik Schürmann	d09d4296da	Silently fail on import on key import with ArrayIndexOutOfBoundsException	2014-10-16 13:36:21 +02:00
Dominik Schürmann	81935fe99b	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-15 23:22:12 +02:00
Dominik Schürmann	0cdcc90984	More consisitency	2014-10-15 23:22:08 +02:00
Dominik Schürmann	4e1053c6fa	More color/icon consistency	2014-10-15 23:05:29 +02:00
Vincent Breitmoser	b6c7231a7f	some cleanup and documentation of *Operation classes	2014-10-15 16:57:23 +02:00
Dominik Schürmann	be9b483ee8	color experiments	2014-10-15 12:48:54 +02:00
Vincent Breitmoser	7af0219857	fix test for new PgpDecryptVerify	2014-10-14 16:35:48 +02:00
Vincent Breitmoser	e58ba0f4bb	fix export performance problems	2014-10-14 14:19:54 +02:00
Vincent Breitmoser	40850b933b	actually remove filter spinner code. that's what git is for~	2014-10-13 16:43:17 +02:00
Dominik Schürmann	e9abe57aa7	Remove key list filter for now	2014-10-13 15:53:39 +02:00
Vincent Breitmoser	bfafc44a33	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2014-10-13 15:03:49 +02:00
Vincent Breitmoser	ee4d911baf	make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation	2014-10-13 15:02:42 +02:00
Vincent Breitmoser	aec61fd174	remove DELETE_FILE_SECURELY ... closes #961	2014-10-13 14:55:54 +02:00