593 Commits

Author	SHA1	Message	Date
Dominik Schürmann	a3045c710e	Use new status icons in key list	2014-07-28 09:34:57 +02:00
Dominik Schürmann	0c3b2a6ed4	Smaller status images, green test	2014-07-28 09:10:45 +02:00
Dominik Schürmann	b2f7e839e1	Fix resource names, add small test	2014-07-28 01:23:38 +02:00
Dominik Schürmann	61944b9e39	Add icons from ModernPGP project	2014-07-28 01:12:23 +02:00
Dominik Schürmann	6c7e3aee91	Fix background color of notify area	2014-07-27 21:45:48 +02:00
Dominik Schürmann	7e8b056574	cleanup left-overs	2014-07-27 21:44:00 +02:00
Dominik Schürmann	5974dccbea	Redesigned QR Code view	2014-07-27 21:40:43 +02:00
Dominik Schürmann	0f87b81158	Load QR Code asynchronously and with a fade in animation	2014-07-27 20:58:25 +02:00
Dominik Schürmann	57d9c7a013	Open keyboard on passphrase dialog, this should now work on all Android versions... hopefully	2014-07-27 20:42:39 +02:00
Dominik Schürmann	97e8faa1dd	Make PassphraseCacheService a foreground service	2014-07-27 18:56:23 +02:00
Dominik Schürmann	0403cbf11a	Prettify buttons	2014-07-27 18:12:14 +02:00
Dominik Schürmann	dab540e121	Work on first time wizard design	2014-07-27 17:56:52 +02:00
Vincent Breitmoser	45722d7cfb	canonicalize: couple of fixes	2014-07-26 22:16:33 +02:00
Vincent Breitmoser	236a502ea7	generic UncachedKeyRing fixes	2014-07-26 15:51:35 +02:00
Vincent Breitmoser	043ed600e6	Merge remote-tracking branch 'origin/master'	2014-07-26 03:59:12 +02:00
Vincent Breitmoser	7296ac4849	UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings	2014-07-26 03:57:54 +02:00
Vincent Breitmoser	7fe1b00080	fixes for extractPublicKeyRing, update SpongyCastle	2014-07-26 03:56:28 +02:00
Vincent Breitmoser	ab2b90342e	test and fix: adding an empty user id should fail	2014-07-26 03:47:29 +02:00
Dominik Schürmann	5eb414a22b	Program flow fixes	2014-07-25 01:34:29 +02:00
Vincent Breitmoser	cd1511a4e6	canonicalize: fix for tests	2014-07-19 02:19:15 +02:00
Daniel Albert	db002bde7c	Fixed another unescaped apostrophe.	2014-07-17 21:17:39 +02:00
Daniel Albert	8a8d8c5a68	Fixed unescaped apostrophe	2014-07-17 20:53:10 +02:00
Daniel Albert	01046fc0e7	Added description to Setting, Changed title to suggested one	2014-07-17 20:01:53 +02:00
Daniel Albert	d63534d655	Merge remote-tracking branch 'upstream/master' ... Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java	2014-07-16 18:49:16 +02:00
Daniel Albert	e375cde7e1	Final Commit for #662	2014-07-16 18:17:46 +02:00
Dominik Schürmann	82af9672fd	Temporary program flow fixes	2014-07-16 10:07:50 +02:00
Dominik Schürmann	77d04a915b	Simple create key	2014-07-16 10:05:00 +02:00
Dominik Schürmann	57f5a788fd	Simple create key	2014-07-16 10:04:48 +02:00
Dominik Schürmann	c1c831e52b	New first time screen	2014-07-16 09:49:37 +02:00
Dominik Schürmann	d3c54d5f12	Fallback if no primary user id exists	2014-07-16 00:22:45 +02:00
Vincent Breitmoser	64b87f75be	move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId)	2014-07-15 19:47:52 +02:00
Dominik Schürmann	848043a481	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-15 19:34:01 +02:00
Vincent Breitmoser	501d4b887a	signatures: a revocation reason does NOT determine if a cert is a revocation type	2014-07-15 19:31:27 +02:00
Dominik Schürmann	503b146a14	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-15 19:22:44 +02:00
Dominik Schürmann	72237a0892	some fixes for edit	2014-07-15 19:22:40 +02:00
Vincent Breitmoser	29145e49c9	merge: different msg if nothing was merged	2014-07-15 19:17:08 +02:00
Vincent Breitmoser	858fe47d46	Merge remote-tracking branch 'origin/master' into external-test ... Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java	2014-07-15 17:39:36 +02:00
Daniel Albert	c101ee0240	Merge remote-tracking branch 'upstream/master' into feature-conceal-software	2014-07-13 15:39:16 +02:00
Dominik Schürmann	0ce9c13132	Fix strings from 'keys' to 'passphrases'	2014-07-12 21:07:29 +02:00
Dominik Schürmann	af5fddab7c	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-12 21:04:57 +02:00
Dominik Schürmann	45dfb39749	more work on edit key	2014-07-12 20:39:23 +02:00
Daniel Albert	bd909375c2	Fixed misplaced bracket	2014-07-12 19:24:51 +02:00
Daniel Albert	92c66743e0	Added Preference for concealing the PgpApplication	2014-07-12 19:19:12 +02:00
Daniel Albert	066591dab1	Wello there, That's Java, not C^^	2014-07-12 18:53:52 +02:00
Daniel Albert	079194abe5	Fixed issues discussed in #713	2014-07-12 18:12:03 +02:00
Daniel Albert	7a3fe61a1f	Put text into strings.xml, for internationalization	2014-07-12 12:52:44 +02:00
Daniel Albert	2568ea4b2e	Added Purging for Android < 4.1	2014-07-12 12:42:48 +02:00
Daniel Albert	cf40517eac	Implemented Notification, no fallback yet	2014-07-12 12:27:19 +02:00
Daniel Albert	af90db96a5	new PassphraseCache, storing UserIDs as well	2014-07-12 10:51:12 +02:00
Vincent Breitmoser	f82093c666	modifyKey: error out on integrity check fails	2014-07-12 02:02:37 +02:00