669 Commits

Author	SHA1	Message	Date
Vincent Breitmoser	3d7cdf5428	move upload/update buttons from menu to buttons	2014-07-31 23:49:53 +02:00
Dominik Schürmann	3451111edd	Fix update from keyserver	2014-07-31 23:51:08 +02:00
Dominik Schürmann	3e918a70ea	Remove private/secret key language from strings	2014-07-31 23:34:13 +02:00
Dominik Schürmann	97209f9d3d	Fixes for upload	2014-07-31 23:31:09 +02:00
Dominik Schürmann	38120ae77c	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-31 23:13:33 +02:00
Dominik Schürmann	db70fcfdbf	Create key: design fixes	2014-07-31 23:13:29 +02:00
Vincent Breitmoser	caad5d1fc1	fix bug in UploadKeyActivity, minor work on uri handling	2014-07-31 23:07:20 +02:00
Vincent Breitmoser	c5ce794ef7	more fixes on canonicalization and progress	2014-07-31 22:36:25 +02:00
Dominik Schürmann	50aea621ba	Fix animations in create key	2014-07-31 21:51:35 +02:00
Dominik Schürmann	b9694ae9c5	Add notify layouts to some activities	2014-07-31 21:29:45 +02:00
Dominik Schürmann	38922f96a6	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-31 21:20:16 +02:00
Dominik Schürmann	138d5a1d9c	Robots like coffee too...	2014-07-31 21:18:24 +02:00
Vincent Breitmoser	58c2ca6eb8	completely overengineer progress indication in {modify,create}SecretKeyRing methods	2014-07-31 20:59:50 +02:00
Dominik Schürmann	7bbe869c88	Parcelable data over 1MB can not be send through binder, parcel into a cache file, fix #592	2014-07-31 20:38:06 +02:00
Vincent Breitmoser	d48e980946	avoid nullpointerexception in EditKeyResult	2014-07-31 19:27:26 +02:00
Vincent Breitmoser	acb5a70e44	fix fromStream method, properly recognize multiple concatenated streams	2014-07-31 19:27:26 +02:00
Vincent Breitmoser	b40081c364	always return an EditKeyResult in modifyKey method	2014-07-31 19:27:25 +02:00
Dominik Schürmann	279ddf7cbe	Handle result in create key	2014-07-31 19:19:11 +02:00
Dominik Schürmann	258bd3a44f	Fix string	2014-07-31 19:06:30 +02:00
Dominik Schürmann	80f9c769c0	Keyserver exception translateable	2014-07-31 19:05:09 +02:00
Dominik Schürmann	b052d5e89c	Smaller notes	2014-07-31 18:42:54 +02:00
Vincent Breitmoser	ecb2c2c2b1	reduce memory usage while parsing multiple keyrings from a stream	2014-07-31 18:25:46 +02:00
Dominik Schürmann	aa32c60a0a	Even better Exception handling with keyserver queries	2014-07-31 18:07:11 +02:00
Dominik Schürmann	cc034a0913	Exception handling with keyserver queries	2014-07-31 17:56:47 +02:00
Vincent Breitmoser	33172d598d	couple of logging fixes	2014-07-31 17:09:30 +02:00
Vincent Breitmoser	b156a057e8	rename Wrapped*Key* to Canonicalized*Key*	2014-07-31 17:09:30 +02:00
Dominik Schürmann	9475285013	Better exception handling for import of keys	2014-07-31 17:11:06 +02:00
Dominik Schürmann	1d2c93ca8a	More file association hacks for AndroidManifest and key import	2014-07-31 16:15:36 +02:00
Dominik Schürmann	927b120275	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-07-30 17:47:25 +02:00
Dominik Schürmann	65488cbf05	Create key: work on upload	2014-07-30 17:47:17 +02:00
Vincent Breitmoser	64aac8023e	couple of fixes in save*KeyRing methods	2014-07-30 16:22:55 +02:00
Dominik Schürmann	fcc535a573	Create key: repeat passphrase	2014-07-30 15:29:01 +02:00
Dominik Schürmann	052cdfa392	Create key: upload	2014-07-30 15:19:33 +02:00
Dominik Schürmann	e46d72ba27	Fix drawer in key list	2014-07-30 14:59:12 +02:00
Dominik Schürmann	70bfb5c586	return values for create key	2014-07-30 14:57:59 +02:00
Dominik Schürmann	cdee62b79d	Create key: layout above buttons	2014-07-30 01:13:02 +02:00
Dominik Schürmann	9f9aa79066	Fix conflicts	2014-07-30 01:07:10 +02:00
Dominik Schürmann	43b8170a44	Merge branch 'master' of github.com:open-keychain/open-keychain ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java	2014-07-30 00:58:28 +02:00
Dominik Schürmann	6448de8f6a	Create key with fragments	2014-07-30 00:50:53 +02:00
Vincent Breitmoser	4457b4a24c	fix a couple remaining AppMsgs	2014-07-29 14:00:36 +02:00
Vincent Breitmoser	377d0f09fa	Merge branch 'ditch-appmsg' ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java	2014-07-29 13:53:18 +02:00
Vincent Breitmoser	da131220aa	watch out for nullpointers from get(Un|)HashedSubpackets ... fixes #721	2014-07-28 17:09:56 +02:00
Dominik Schürmann	cce243299a	Fix build by removing old icon reference	2014-07-28 16:26:06 +02:00
Dominik Schürmann	ed6a89f35c	Use new icons in other key related activites, delete old icons	2014-07-28 16:10:36 +02:00
Dominik Schürmann	23689da56d	Use verified icon for certify action	2014-07-28 12:24:40 +02:00
Dominik Schürmann	730f820c8c	Set visibility at last	2014-07-28 11:17:12 +02:00
Dominik Schürmann	3d6edd1190	Use icons in key view	2014-07-28 11:11:23 +02:00
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