1259 Commits

Author	SHA1	Message	Date
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
Vincent Breitmoser	354bc87579	fix ByteBuffer offset mistake in NfcActivity	2014-09-30 11:36:51 +02:00
Vincent Breitmoser	b2b19d7b2b	pass (encryption) key id from Decrypt*Fragment to NfcActivity	2014-09-30 02:14:28 +02:00
Vincent Breitmoser	11d0f4510b	pass key id for check from EncryptActivity to NfcActivity	2014-09-30 02:03:17 +02:00
Vincent Breitmoser	bd3f6a22cb	add (optional) keyId check in NfcActivity	2014-09-30 01:47:04 +02:00
Vincent Breitmoser	dabdda36cf	revamp fingerprint and keyid methods in NfcActivity	2014-09-30 01:46:16 +02:00
Vincent Breitmoser	de5dd482e1	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-09-30 00:51:58 +02:00
Vincent Breitmoser	384724f9b5	request passphrase for correct subkey in OpenPgpService ... fixes #811, hopefully	2014-09-30 00:51:25 +02:00
Dominik Schürmann	9e7c9a0d32	Fix nullpointer in DecryptActivity	2014-09-29 23:05:17 +02:00
Dominik Schürmann	7531106565	3.0 beta2	2014-09-29 22:54:36 +02:00
Dominik Schürmann	f275daf1fb	Disable NfcIntentActivity until we implement it properly	2014-09-29 22:54:17 +02:00
Dominik Schürmann	43140c10b1	Fixes for share to decrypt	2014-09-29 22:52:03 +02:00
Dominik Schürmann	8e5c5c9503	Remove unused layouts	2014-09-29 22:24:55 +02:00
Dominik Schürmann	51ea71d68a	Maybe fixes encrypt files on tablets	2014-09-29 22:23:48 +02:00
Vincent Breitmoser	0b16a4edfd	Merge remote-tracking branch 'origin/master' ... Conflicts: OpenKeychain/src/main/AndroidManifest.xml	2014-09-29 21:32:21 +02:00
Vincent Breitmoser	7f547afe42	add barely functional nfc intent activity (WIP!)	2014-09-29 21:31:19 +02:00
Vincent Breitmoser	c13a7b7eae	add class for proper nfc tlv packet parsing	2014-09-29 21:22:48 +02:00
Dominik Schürmann	f7fe236bd5	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-09-29 21:20:30 +02:00