271 Commits

Author	SHA1	Message	Date
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	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	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
Dominik Schürmann	5eb414a22b	Program flow fixes	2014-07-25 01:34:29 +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
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	72237a0892	some fixes for edit	2014-07-15 19:22:40 +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	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	92c66743e0	Added Preference for concealing the PgpApplication	2014-07-12 19:19:12 +02:00
Daniel Albert	079194abe5	Fixed issues discussed in #713	2014-07-12 18:12:03 +02:00
Daniel Albert	cf40517eac	Implemented Notification, no fallback yet	2014-07-12 12:27:19 +02:00
Vincent Breitmoser	54bc874ce5	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/OperationResultParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java	2014-07-11 21:00:26 +02:00
Vincent Breitmoser	1436ab8d90	SaveKeyringParcel: follow attribute m prefix coding guideline	2014-07-11 13:51:36 +02:00
Dominik Schürmann	daa1f5cf8e	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-08 03:34:53 +02:00
Dominik Schürmann	5adcb7885c	Work on subkeys adapter	2014-07-08 03:34:27 +02:00
Art O Cathain	ccb1579864	Prefer composition to inheritance is the mantra these das	2014-07-06 15:23:39 +01:00
Dominik Schürmann	709196f774	Use strings in edit key	2014-07-03 16:49:25 +02:00
Dominik Schürmann	1ba41e7482	Remove old edit button, rename activities	2014-07-03 16:21:16 +02:00
Dominik Schürmann	bd7b4ccf2b	cleanup, debug for passphrase set	2014-07-03 15:58:03 +02:00
Dominik Schürmann	6ca9d8a268	fix no passphrase check	2014-07-03 15:54:07 +02:00
Dominik Schürmann	b9d2ae938a	Cache passphrase for edit	2014-07-03 15:49:46 +02:00
Dominik Schürmann	2988ac6e7b	Cache passphrase for edit	2014-07-03 15:48:46 +02:00
Dominik Schürmann	9cbf78f7ad	cleanup	2014-07-03 15:24:04 +02:00
Dominik Schürmann	42cc8b687b	edit key: subkey adapter	2014-07-03 15:14:06 +02:00
Dominik Schürmann	55f067b063	Work on edit	2014-07-03 15:06:05 +02:00
Dominik Schürmann	8cbdf7b1c5	smaller dropdown items	2014-07-03 08:48:33 +02:00
Dominik Schürmann	3512ac7199	Remove unnecessary error logs	2014-07-02 20:53:16 +02:00
Dominik Schürmann	d967c5d864	merge KeychainIntentService	2014-07-02 16:49:21 +02:00
Dominik Schürmann	13a13829a8	fix nullpointer, cleanup	2014-07-02 16:47:12 +02:00
Dominik Schürmann	94a58f3aa8	remove init methods from adapter	2014-07-02 16:33:30 +02:00
Vincent Breitmoser	a920f9ce0c	Merge remote-tracking branch 'origin/master'	2014-07-02 16:05:58 +02:00
Vincent Breitmoser	100b5f4c5f	Merge branch 'create-keyring'	2014-07-02 16:05:28 +02:00
Dominik Schürmann	3d34eb8ca4	edit key: work on saving	2014-07-02 15:42:38 +02:00
Dominik Schürmann	4f83a4f163	Edit key: adding user ids	2014-07-02 15:10:50 +02:00
Vincent Breitmoser	6f558add35	use expert create key for key creation testing (revert this later on!)	2014-07-02 15:05:02 +02:00
Dominik Schürmann	7408a35e19	edit key: part 3	2014-07-01 12:36:02 +02:00
Dominik Schürmann	7c84b1fffd	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-06-30 22:01:25 +02:00