1252 Commits

Author	SHA1	Message	Date
Dominik Schürmann	9e1a0c2c0a	Pass imported master key ids via result parcel	2014-10-04 18:59:59 +02:00
Dominik Schürmann	c614d8d4e0	Fixing import, start qr code stuff	2014-10-04 18:22:55 +02:00
Vincent Breitmoser	7e5918efa3	Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify	2014-10-04 16:02:18 +02:00
Vincent Breitmoser	d004bf236b	improve CertifyResult, add custom notify	2014-10-04 16:01:24 +02:00
Dominik Schürmann	7891560fc2	Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify	2014-10-04 15:42:36 +02:00
Dominik Schürmann	a29d6b0ef3	Import code, fix collision of key spinner with other loaders	2014-10-04 15:42:23 +02:00
Vincent Breitmoser	0e0e3d8dd0	redesign certify action to work with parcel input and result	2014-10-04 15:19:43 +02:00
Dominik Schürmann	f0ee7ed4cf	New add keys activity	2014-10-04 13:44:34 +02:00
Vincent Breitmoser	dcd22d9815	keychainintentservice: rearrange actions in alphabetical order	2014-10-04 12:31:05 +02:00
Vincent Breitmoser	ff144c7c11	canonicalize: compare user ids as string rather than bytes	2014-10-04 11:14:02 +02:00
Vincent Breitmoser	2b5341f0d4	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-10-03 23:10:37 +02:00
Vincent Breitmoser	f03822fefd	fix nullpointer on button push while data is still loading ... fixes #934	2014-10-03 23:08:32 +02:00
Dominik Schürmann	f6e0d0f495	Make app_name translatable	2014-10-03 18:49:31 +02:00
Dominik Schürmann	628eef2ab0	Version 3.0.1	2014-10-03 18:42:11 +02:00
Dominik Schürmann	3dfef61de5	Fix string reference	2014-10-03 18:42:03 +02:00
Dominik Schürmann	13cd1daaaa	Pull from transifex	2014-10-03 18:37:56 +02:00
Dominik Schürmann	0b572e9001	Changelog	2014-10-03 18:31:47 +02:00
Dominik Schürmann	d5c6e430a5	Null check for getSelectedEntries	2014-10-03 13:37:49 +02:00
Vincent Breitmoser	228e5653f9	one more fix for getting the right subkey in api signing	2014-10-03 13:25:25 +02:00
Vincent Breitmoser	1ed6083a24	forgot adjustments in ProviderHelper	2014-10-03 04:42:01 +02:00
Vincent Breitmoser	f456c8a17d	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-10-03 04:25:08 +02:00
Vincent Breitmoser	662cc53859	clean up PgpImportExport a bit	2014-10-03 04:25:00 +02:00
Vincent Breitmoser	00bbf8c267	move IteratorWithSize interface into ParcelableFileCache - much cleaner	2014-10-03 04:22:32 +02:00
Vincent Breitmoser	504064302b	actually use iterator interface for ParcelableFileCache in activities	2014-10-03 04:16:14 +02:00
Vincent Breitmoser	04c8d42436	get rid of two consolidate number preferences	2014-10-03 03:37:08 +02:00
Vincent Breitmoser	a91468565f	use iterator interface exclusively in ParcelableFileCache	2014-10-03 03:29:23 +02:00
Dominik Schürmann	4cfc7feb43	More beautifyKeyIdWithPrefix	2014-10-03 03:16:34 +02:00
Dominik Schürmann	ef7eab2c8b	Merge branch 'master' of github.com:open-keychain/open-keychain ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java	2014-10-03 02:20:38 +02:00
Dominik Schürmann	b9dc21969f	Fix nullpointer with clipboard	2014-10-03 02:17:51 +02:00
Vincent Breitmoser	4b4e885e55	more getActivity() checks	2014-10-03 02:13:22 +02:00
Vincent Breitmoser	34e4dabea9	fix nullpointer with subtle attention seeker	2014-10-03 02:07:09 +02:00
Vincent Breitmoser	08bfc2ae73	fix hideKeyboard() in other activities as well, just to be safe	2014-10-02 19:40:43 +02:00
Vincent Breitmoser	a361e82a4d	fix NullPointerException in keyboard hack	2014-10-02 19:35:03 +02:00
Vincent Breitmoser	37cb5c4c78	make getSignId a secret key operation, and respect unavailable keys ... This one should remedy #811, but waiting for a test	2014-10-02 19:26:07 +02:00
Dominik Schürmann	9a296c012d	Version 3.0	2014-10-02 14:22:06 +02:00
Dominik Schürmann	8192bf99a6	mProgressDialogFragment null check	2014-10-02 14:05:54 +02:00
Dominik Schürmann	c2f85c7446	Remove unnecessary call to mFingerprintQrCode	2014-10-02 12:50:38 +02:00
Dominik Schürmann	6da367e469	Fix IllegalStateException in ViewKeyShareFragment	2014-10-02 12:43:18 +02:00
Dominik Schürmann	a125b51b1c	Fix nullpointer with getS2K()	2014-10-02 12:33:56 +02:00
Dominik Schürmann	675d2bd6dd	code style	2014-10-02 11:47:42 +02:00
Dominik Schürmann	8f616bcf0c	Add null check when retrieving key ids from contacts api	2014-10-02 11:32:10 +02:00
Dominik Schürmann	17e45d94a8	Add workaround for bug #912	2014-10-02 11:23:43 +02:00
Dominik Schürmann	42ce3bb0d3	Fix decrypt/verify from gmail/aosp mail with sharing intent, fix scrolling in decryt screen	2014-10-01 15:03:53 +02:00
Dominik Schürmann	e7cbf975ac	More debugging output	2014-10-01 14:14:50 +02:00
Dominik Schürmann	f841203f5f	Add filterTouchesWhenObscured to prevent Touch-Event Hijacking	2014-10-01 10:51:02 +02:00
Dominik Schürmann	84fcbba74d	check key ids when used from api	2014-10-01 10:48:28 +02:00
Dominik Schürmann	e1a81ae5cd	Update from transifex	2014-09-30 20:00:14 +02:00
Dominik Schürmann	cce2365173	Clarify api_create_account_text	2014-09-30 19:55:30 +02:00
Dominik Schürmann	b1b16b9313	3.0 beta3	2014-09-30 17:50:16 +02:00
Vincent Breitmoser	51ecce510f	fix minor logic error (haha)	2014-09-30 14:10:54 +02:00