232 Commits

Author	SHA1	Message	Date
Dominik Schürmann	3512ac7199	Remove unnecessary error logs	2014-07-02 20:53:16 +02:00
Dominik Schürmann	d967c5d864	merge KeychainIntentService	2014-07-02 16:49:21 +02:00
Dominik Schürmann	13a13829a8	fix nullpointer, cleanup	2014-07-02 16:47:12 +02:00
Dominik Schürmann	94a58f3aa8	remove init methods from adapter	2014-07-02 16:33:30 +02:00
Vincent Breitmoser	a920f9ce0c	Merge remote-tracking branch 'origin/master'	2014-07-02 16:05:58 +02:00
Vincent Breitmoser	100b5f4c5f	Merge branch 'create-keyring'	2014-07-02 16:05:28 +02:00
Dominik Schürmann	3d34eb8ca4	edit key: work on saving	2014-07-02 15:42:38 +02:00
Dominik Schürmann	4f83a4f163	Edit key: adding user ids	2014-07-02 15:10:50 +02:00
Vincent Breitmoser	6f558add35	use expert create key for key creation testing (revert this later on!)	2014-07-02 15:05:02 +02:00
Dominik Schürmann	7408a35e19	edit key: part 3	2014-07-01 12:36:02 +02:00
Dominik Schürmann	7c84b1fffd	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-06-30 22:01:25 +02:00
Dominik Schürmann	c2ba7e2420	work on edit key	2014-06-30 22:01:17 +02:00
Daniel Albert	5dcbc07af9	Fixed Bootstrap resource	2014-06-30 21:32:40 +02:00
Daniel Albert	158d19a945	Fixed, issue #702	2014-06-30 19:13:09 +02:00
Daniel Albert	df9af316b4	Merge branch 'master' of https://github.com/open-keychain/open-keychain	2014-06-30 19:09:56 +02:00
Daniel Albert	1e9789f5b4	Converted all other buttons	2014-06-30 19:09:13 +02:00
Daniel Albert	2406842847	Ported even more buttons to use new design (Key and User editor) ... Added drawables for them	2014-06-29 22:31:37 +02:00
Daniel Albert	e8bb14ca26	Converted AsymetricKeyFragment to new button style	2014-06-29 15:28:24 +02:00
Daniel Albert	9091c22240	Added new button style and converted account_settings and the select_secret_key_layout to use it	2014-06-29 13:59:51 +02:00
Daniel Albert	4beff43a83	Updated file_dialog to use the new buttons	2014-06-29 13:21:33 +02:00
Daniel Albert	bd44516576	Added button_rounded style ... converted decrypt_file_fragment to new style	2014-06-28 21:12:56 +02:00
Vincent Breitmoser	6d7a9ec48a	pass import results through to viewkeyactivity on update	2014-06-28 20:54:14 +02:00
Vincent Breitmoser	3acb7fb087	fix nullpointerexception in importkeyactivity	2014-06-28 20:54:13 +02:00
Vincent Breitmoser	d6a2875816	code cleanup and plurals in import log entries ... closes #698	2014-06-28 19:15:28 +02:00
Daniel Albert	2da5bfabd3	Merge remote-tracking branch 'upstream/master'	2014-06-28 12:30:30 +02:00
Dominik Schürmann	3f3e1cdb05	Magic to find possible mails and names of device owner	2014-06-28 00:05:12 +02:00
Dominik Schürmann	1d5606a1a3	More wizardry	2014-06-27 23:01:11 +02:00
Dominik Schürmann	8bfba0826f	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-06-27 21:40:26 +02:00
Dominik Schürmann	9fe07478e7	Start work on a first-time wizard	2014-06-27 21:40:18 +02:00
Daniel Albert	567e5cc6a5	Added unlock icon, fixed drawer items, switched to icons from resource in drawer	2014-06-27 21:03:19 +02:00
Dominik Schürmann	a1bcbe72a3	new edit key: first version to add user ids	2014-06-24 22:58:28 +02:00
Daniel Albert	02bcd391bf	Fix for #687	2014-06-24 20:15:48 +02:00
Dominik Schürmann	514a4c668b	new edit key: change passphrase	2014-06-22 18:26:17 +02:00
Dominik Schürmann	b43fb63753	new edit key: diff for existing user ids	2014-06-22 18:12:04 +02:00
Dominik Schürmann	4db0194e6a	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-06-22 16:03:13 +02:00
Dominik Schürmann	106e1fcf03	Rename adapter	2014-06-22 16:03:03 +02:00
Vincent Breitmoser	002a391a68	Merge remote-tracking branch 'origin/master'	2014-06-22 13:42:03 +02:00
Vincent Breitmoser	857b15cbd5	use hashcode instead of keyid in import list (keyids may not be unique!)	2014-06-22 13:32:07 +02:00
Dominik Schürmann	18430bef17	Start new designed activity	2014-06-21 20:25:51 +02:00
Dominik Schürmann	a1525bffe2	Fix qr code finally	2014-06-20 23:01:35 +02:00
Vincent Breitmoser	0d644e37b1	import: forward motion events to activity regardless	2014-06-20 22:30:54 +02:00
Dominik Schürmann	0a790c7aa2	Work on Qr code import	2014-06-20 22:28:08 +02:00
Dominik Schürmann	f0b8261ad3	Use actionbar button for log activity	2014-06-20 15:49:54 +02:00
Dominik Schürmann	717d66961b	Fix onTouchEvent delegation, with workaround for Android bug	2014-06-20 15:39:27 +02:00
Dominik Schürmann	4aec28c237	Fix update from keyserver flow	2014-06-20 15:14:34 +02:00
mar-v-in	58706425d6	Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file	2014-06-19 13:57:35 +02:00
Dominik Schürmann	3d8e6b303c	Fixing fingerprint search, part 1	2014-06-19 01:26:21 +02:00
Dominik Schürmann	47edcacf61	Remove unused code to import splitted qr codes	2014-06-19 00:54:52 +02:00
Dominik Schürmann	7fc188dbd6	New callback model for ImportKeysActivity	2014-06-19 00:38:36 +02:00
Vincent Breitmoser	5c6139f57a	forward touch events to pager in import activity	2014-06-18 22:57:56 +02:00