2110 Commits

Author	SHA1	Message	Date
Vincent Breitmoser	b509c3ed39	fix fragment handling in ViewKeyActivity ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java	2015-05-17 01:04:19 +02:00
Dominik Schürmann	5c44f84009	3.2.1	2015-05-10 13:16:37 +02:00
Dominik Schürmann	a35594201a	Fixing rotate crashes in create key	2015-05-10 13:16:03 +02:00
Dominik Schürmann	e4b7920edc	Fix crash with v3 key fingerprints	2015-05-10 12:11:35 +02:00
Dominik Schürmann	0a29f6d3ac	Cleanup	2015-05-10 11:52:39 +02:00
Dominik Schürmann	5b1bf888b4	Reformat manifest	2015-05-10 11:15:10 +02:00
Dominik Schürmann	874da746ea	Add dontnote to proguard	2015-05-10 10:44:04 +02:00
Dominik Schürmann	3c0f82970c	Workaround for Samsung Android 4.2 bug	2015-05-10 04:58:44 +02:00
Dominik Schürmann	bfc57aefa5	Use snackbar lib from maven repo	2015-05-10 03:39:19 +02:00
Dominik Schürmann	e14a2efcad	Fixes and clarifications to app signature (or better certificate) pinning	2015-05-10 03:31:19 +02:00
Dominik Schürmann	6e326fb000	Add self-encrypt for old API	2015-05-10 03:00:42 +02:00
Adithya Abraham Philip	797cd28997	fixed sync on key import, 'me' linked contact crash	2015-05-08 19:05:21 +05:30
Dominik Schürmann	63022aa96a	Version 3.2	2015-05-06 14:32:17 +02:00
Dominik Schürmann	dad19454e9	Pull from transifex	2015-05-06 14:04:03 +02:00
Vincent Breitmoser	91d500b20d	check for fingerprint of any subkey (arguable?)	2015-05-06 11:26:01 +02:00
Dominik Schürmann	a45aaa2277	Fix import of keyring with pub+sec key with same key id	2015-05-06 04:10:27 +02:00
Dominik Schürmann	d2998ea80d	Rename for consistency	2015-05-06 03:37:57 +02:00
Dominik Schürmann	8de6589c9d	Renaming for consisitency	2015-05-06 03:29:04 +02:00
Dominik Schürmann	f102ae5da5	Move error overlay into generalized DecryptFragment, better error handling in DecryptTextActivity	2015-05-06 03:26:42 +02:00
Dominik Schürmann	afc91fb918	Switch to new library repos	2015-05-06 00:08:04 +02:00
Dominik Schürmann	f87d21a661	Merge branch 'development' of github.com:open-keychain/open-keychain into development	2015-05-05 09:27:07 +02:00
Dominik Schürmann	e3f5c6d01e	Cleanup manifest	2015-05-05 09:26:57 +02:00
Dominik Schürmann	855b8c4ef9	Fix nullpointer in file decryption	2015-05-05 09:05:39 +02:00
William Faulk	aba9c884ce	revert unneeded changes for short key ID	2015-05-04 17:15:51 -04:00
William Faulk	7e7892ff2e	revert unneeded changes for old temp Bluetooth share file	2015-05-04 17:15:10 -04:00
William Faulk	44b47e185d	use single file extension	2015-05-04 17:09:59 -04:00
William Faulk	eabc6cd8d4	use TemporaryStorageProvider for Bluetooth Share	2015-05-04 16:49:30 -04:00
William Faulk	af1809eebc	Use FILE_EXTENSION constants	2015-05-04 16:46:16 -04:00
William Faulk	be3e52884f	Use primary user ID for filename instead of short key ID	2015-05-04 16:46:15 -04:00
William Faulk	6383d19dd3	Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater	2015-05-04 16:46:15 -04:00
William Faulk	b06e7cd737	Fix Bluetooth share without breaking others	2015-05-04 16:46:15 -04:00
Dominik Schürmann	291f95db5a	Fix revoked/expired state in decrypt activity	2015-05-04 21:13:07 +02:00
Dominik Schürmann	2583f77f07	Fix cancel/skip in create key wizard	2015-05-04 20:47:19 +02:00
Dominik Schürmann	f3090f2939	Display notify above keyboard in CreateKeyEmailFragment	2015-05-04 15:34:48 +02:00
Dominik Schürmann	2cd1cf9192	Fix email pattern	2015-05-04 15:27:19 +02:00
Dominik Schürmann	e1ca612bc4	Use more simple email validation regex	2015-05-04 14:55:56 +02:00
Dominik Schürmann	520f9abea3	Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java	2015-05-04 14:42:21 +02:00
Dominik Schürmann	eb9019c78c	Temporary fix for gradle dependency bug	2015-05-04 14:29:47 +02:00
Dominik Schürmann	dedda1603c	Fix dublicated code in CreateKeyEmailFragment	2015-05-04 14:19:16 +02:00
Dominik Schürmann	39c610c2d1	Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development	2015-05-04 14:18:10 +02:00
Dominik Schürmann	b726dea244	license header for PgpCertifyOperation	2015-05-04 14:12:42 +02:00
Dominik Schürmann	51bb96742f	Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938	2015-05-04 14:01:34 +02:00
Dominik Schürmann	4e425495e6	Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 with db upgrade	2015-05-04 13:57:43 +02:00
Dominik Schürmann	aa68c41f5a	Fix yubikey strings	2015-05-01 14:48:57 +02:00
Dominik Schürmann	f3870cee29	More nullpointer fixes	2015-05-01 14:44:40 +02:00
Dominik Schürmann	e91dc022fb	Fix nullpointer in EncryptKeyCompletionView	2015-05-01 14:36:22 +02:00
Dominik Schürmann	5ad50b99a2	Remove time from key creation display	2015-04-30 19:02:33 +02:00
Dominik Schürmann	c88d2e42b7	Fix key creation string and display	2015-04-30 18:57:51 +02:00
Dominik Schürmann	7c275fed9d	API: Allow selection of decryption keys when decryption fails	2015-04-30 18:45:43 +02:00
Daniel Ramos	e159e619d2	-removed unneeded inputType attribute from xml files (+1 squashed commits) ... Squashed commits: [ef54e68] -code style fixing	2015-04-30 00:54:56 +01:00