cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,337 Commits 1 Branch 0 Tags
5e4239a7b98a050b4312eee075f2fdac7f2b8af2
Commit Graph
1337 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 5e4239a7b9 Merge branch 'certify' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
 2014-03-17 14:18:42 +01:00
Vincent Breitmoser 87004fd0ca certify: preserve user id certificates when saving secret keys 2014-03-17 14:11:32 +01:00
Vincent Breitmoser e8ad4317a4 certs: more filters, better initial uid selection, code cosmetics 
- add three types of filters for certificate list (ui looks like crap
      there, need to work on that)
    - select uncertified uids by default in CertifyKeyActivity
    - move some code around in KeychainProvider, 's slightly less hacky now
 2014-03-17 14:10:40 +01:00
Vincent Breitmoser f192c70179 certs: green dots for verified status \o/ 2014-03-15 19:58:17 +01:00
Vincent Breitmoser 5c28da44d6 certs: provider cleanup and bugfixing 2014-03-15 19:57:55 +01:00
Vincent Breitmoser 6bacb5ff51 Merge branch 'certify' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
	OpenPGP-Keychain/src/main/res/values/strings.xml
 2014-03-15 18:34:20 +01:00
Vincent Breitmoser 95be228b47 certify: sign individual UIDs 
direct signing of pubkeys is out for now. not sure how this should be
handled, but it's trivial to re-add so leaving this up for discussion
for now.
 2014-03-15 18:20:50 +01:00
Vincent Breitmoser 8fbd77fb15 certify: preserve user id certificates when saving secret keys 2014-03-15 18:20:50 +01:00
Vincent Breitmoser a3224687f6 certify: add some subscopes in PgpKeyOperation for readability 
note this commit introduces NO semantical changes whatsoever!
 2014-03-15 18:20:50 +01:00
Vincent Breitmoser 1de0312bb5 certify: revamp certifykeyactivity 
show info on the key to be certified, along with a list of (selectable)
user ids. user ids are handed through to the signing service, but not
yet handled.
 2014-03-15 18:20:49 +01:00
Vincent Breitmoser 49984846d5 certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha) 2014-03-15 18:20:49 +01:00
Vincent Breitmoser efc8252598 certify: viewkeyuseridsadapter cosmetics and checkbox capability 2014-03-15 18:20:49 +01:00
Vincent Breitmoser 9920196f70 certify: selectsecretkeyfragment cosmetics 2014-03-15 18:20:49 +01:00
Vincent Breitmoser db25c56b64 certify: add certify action button to viewkeymainfragment 2014-03-15 18:20:42 +01:00
Vincent Breitmoser 0922a8cf04 move fingerprint coloring into helper 2014-03-15 02:20:28 +01:00
Vincent Breitmoser a73e91c49c Merge branch 'master' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
 2014-03-15 00:18:50 +01:00
Dominik Schürmann efab1d27ac Merge pull request #417 from uberspot/master 
Make email address less restrictive and fix double user ids
 2014-03-14 07:04:32 +01:00
uberspot 985a6793c0 Fix two bugs in ImportKeys screen (issue #416) 2014-03-14 00:59:10 +02:00
uberspot b12392594f Make email address less restrictive and add icon to show when it's correct 2014-03-14 00:02:31 +02:00
Dominik Schürmann c737f01a72 Merge pull request #415 from uberspot/master 
final code style changes
 2014-03-13 22:12:06 +01:00
uberspot 2d0817bd74 final code style changes 2014-03-13 23:03:20 +02:00
Dominik Schürmann b1476a7429 Merge pull request #413 from uberspot/master 
More code style fixes
 2014-03-13 21:49:58 +01:00
uberspot 1c95970ea3 fix code style in /pgp 2014-03-13 22:08:13 +02:00
uberspot 6ac4d6c218 final ui code style changes 2014-03-13 21:39:14 +02:00
uberspot 2ff6949c95 more code style changes in /ui and /util 2014-03-13 21:30:56 +02:00
uberspot 4353ea37e2 more UI code style fixes 2014-03-13 21:30:56 +02:00
uberspot dc5c34ffc5 More code style fixes for /ui 2014-03-13 21:30:56 +02:00
Dominik Schürmann 37c81400ac Fix colors in item view 2014-03-13 20:18:25 +01:00
Dominik Schürmann c1e16995db remove unused color 2014-03-13 20:12:57 +01:00
Dominik Schürmann ba9a4bec3a Improve list item view, borderless button for API < 11 2014-03-13 20:11:21 +01:00
Dominik Schürmann 793d8c266a Merge pull request #412 from uberspot/master 
Code style changes
 2014-03-13 19:40:56 +01:00
uberspot ad1e047aa9 First code style changes in ui 2014-03-13 20:25:01 +02:00
uberspot f26ba217e5 Fix code style in /helper 2014-03-13 20:14:04 +02:00
uberspot 540aa044e2 Fix code style in keychain/service/ 2014-03-13 20:14:04 +02:00
uberspot 79a8528a63 Optimize imports in all files, remove useless whitespace in some and fix indentation 2014-03-13 20:14:04 +02:00
Dominik Schürmann 5b907f222e Merge pull request #407 from uberspot/master 
Add apg's change to colorizing, no more background changes needed
 2014-03-13 19:09:13 +01:00
Dominik Schürmann 5c5e9d8e32 Forgot faq file 2014-03-13 19:09:54 +01:00
Dominik Schürmann bc1a3850ac Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-13 19:08:29 +01:00
Dominik Schürmann 908cf8e769 Add FAQ tab to help 2014-03-13 19:08:03 +01:00
Dominik Schürmann 32dcf86212 Merge pull request #408 from gogowitczak/master 
Specifying connection port in KeyServer
 2014-03-13 19:02:35 +01:00
Dominik Schürmann 4c5ae3cdaa Readd create key menu items 2014-03-13 19:01:24 +01:00
Dominik Schürmann cf51e5ff56 XML cleanup and bigger filename EditText 2014-03-13 18:53:21 +01:00
Dominik Schürmann 471cefa71f Cleanup and simplification 2014-03-13 18:27:08 +01:00
Dominik Schürmann fb1b0deaf5 Merge pull request #403 from Valodim/master 
unify public and secret key lists
 2014-03-13 18:14:19 +01:00
gogowitczak ccde4212e0 Added possibility to specify port for KeyServer. 2014-03-13 15:53:43 +01:00
gogowitczak f4370b3ac8 Added possibility to specify port for KeyServer. 2014-03-13 15:39:38 +01:00
uberspot f055228e5b add apg's change to colorizing, no more background changes needed 2014-03-13 16:09:37 +02:00
Vincent Breitmoser be3828c89e drop unified uri in favor of generic /key_rings 
this works well in the uri schema, and we get notifications back with no
effort.

....also remove a line I committed accidentally oO
 2014-03-13 14:34:07 +01:00
Vincent Breitmoser 9a1ce093bf Merge remote-tracking branch 'origin/master' 
Conflicts:
	OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
 2014-03-13 13:40:47 +01:00
Vincent Breitmoser 6af65a2a9b merge fixes as per comments in merge 
https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753
 2014-03-13 13:06:23 +01:00