2099 Commits

Author	SHA1	Message	Date
Vincent Breitmoser	1463bae1b4	fix merge problems (derp)	2015-05-28 17:32:21 +02:00
Vincent Breitmoser	ee02e110e7	don't keep an activity reference in CreateKeyFinalFragment	2015-05-28 16:35:03 +02:00
Vincent Breitmoser	8de0d9e6da	create keys with fixed timestamp	2015-05-28 16:34:41 +02:00
Vincent Breitmoser	eb830c6786	warn on signature earlier than key creation, err on significantly earlier	2015-05-28 16:33:45 +02:00
Vincent Breitmoser	5c8af1c5a5	don't show allowed key list if no key exists, and some minor PgpDecryptVerify changes	2015-05-28 16:33:45 +02:00
Vincent Breitmoser	1fb7477a5a	correctly preserve state in EncryptTextFragment	2015-05-28 16:33:45 +02:00
Vincent Breitmoser	58583c0819	correctly preserve state in EncryptFilesFragment	2015-05-28 16:33:44 +02:00
Vincent Breitmoser	40ab96539c	move synchronous encryption into activity, and preserve checkbox state	2015-05-28 16:33:44 +02:00
Vincent Breitmoser	7c20c8df93	preserve state in KeySpinner, and some lint fixes	2015-05-28 16:33:44 +02:00
Vincent Breitmoser	8f3e0a9110	rewrite EncryptActivity data flow	2015-05-28 16:33:44 +02:00
Vincent Breitmoser	e03e1e5cfc	fix nullpointer in encrypttextactivity. fixes #1267	2015-05-28 16:33:44 +02:00
Yoshi64Bit	e378c47814	highlight currently selected item in navigation drawer	2015-05-28 16:33:44 +02:00
Dominik Schürmann	08afe42ea6	AssertionError instead of RuntimeException	2015-05-28 16:33:44 +02:00
Dominik Schürmann	79e356e04f	Change convertFingerprintToHex to use RuntimeException	2015-05-28 16:33:43 +02:00
Dominik Schürmann	0b5c66ad0d	Improve strings	2015-05-28 16:33:41 +02:00
Vincent Breitmoser	6e3ed1d2db	do nfc dispatching in MainActivity	2015-05-28 16:33:14 +02:00
Dominik Schürmann	95875d727e	Version 3.2.2	2015-05-21 10:35:31 +02:00
Dominik Schürmann	7e55ba1b36	Merge branch 'master' of github.com:open-keychain/open-keychain	2015-05-21 10:32:15 +02:00
Dominik Schürmann	6b6ca4c18e	Fix language based on feedback from transifex	2015-05-21 10:32:07 +02:00
Vincent Breitmoser	f30900d085	add user id flags to UserAttribute self signatures	2015-05-20 12:47:23 +02:00
Dominik Schürmann	0df51b6140	Fix fingerprint length check in QR Code import	2015-05-19 19:09:39 +02:00
Dominik Schürmann	79b7cec94a	Use Mode.ALPHANUMERIC for QR codes to save space	2015-05-19 19:09:32 +02:00
Vincent Breitmoser	b62ad4d79c	check fingerprint length after scanning qr code ... Fixes #1281	2015-05-17 10:36:30 +02:00
Vincent Breitmoser	fb96b6dfa9	open ViewKeyActivity by subkey in NfcBaseActivity	2015-05-17 02:14:27 +02:00
Vincent Breitmoser	a79d7bd1c2	simplify MainActivity and fix backstack issues	2015-05-17 02:13:51 +02:00
Vincent Breitmoser	3a27a28c0a	re-parcel log in LogDisplayFragment	2015-05-17 01:13:41 +02:00
Vincent Breitmoser	765990ed13	fingerprints are 20 bytes, not 40. duh.	2015-05-17 01:04:34 +02:00
Vincent Breitmoser	9a6f581400	load yubikey fragment after mMasterKeyId is available	2015-05-17 01:04:32 +02:00
Vincent Breitmoser	158263f255	apply promote operation to specific subkeys present on yubikey only	2015-05-17 01:04:31 +02:00
Vincent Breitmoser	71818934ca	pass masterKeyId to yubikey fragment	2015-05-17 01:04:27 +02:00
Vincent Breitmoser	f6643962af	allow state loss when yubikey fragment is loaded	2015-05-17 01:04:25 +02:00
Vincent Breitmoser	d06ae7f691	yubikey: don't assume signing key is masterKeyId in ViewKeyActivity ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java	2015-05-17 01:04:22 +02:00
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	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