Commit Graph
24 Commits
Author SHA1 Message Date
Vincent Breitmoser 87004fd0ca certify: preserve user id certificates when saving secret keys 2014-03-17 14:11:32 +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 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 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
Vincent Breitmoser b9a907df0b remove special treatment for unified list query
note: the unified query /will/ need special treatment once certs are
joined in, so I am leaving this as an artifact commit for later
reference or point to revert to.
2014-03-13 00:29:28 +01:00
Vincent Breitmoser 0b0809ec17 keychainprovider cleanup, kindasorta
removed code redundancy, and the query is in the switch thing now, I
didn't put everything into its own separate sources (yet?).
2014-03-13 00:16:11 +01:00
Vincent Breitmoser 69f5bf6b57 Merge branch 'unified-keylist'
Conflicts:
	OpenPGP-Keychain/src/main/AndroidManifest.xml
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java
	OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml
	OpenPGP-Keychain/src/main/res/menu/key_list.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml
	OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
2014-03-12 18:05:28 +01:00
Vincent Breitmoser be558944b5 add contact count to My Keys header 2014-03-08 14:52:29 +01:00
Vincent Breitmoser de6daf5c30 better handling of multi select in ListKeysFragment 2014-03-08 14:08:44 +01:00
Vincent Breitmoser 16116ba725 ditch old key list activities 2014-03-08 13:42:50 +01:00
Vincent Breitmoser 706e212b6b add edit button and secret key info to public key view 2014-03-08 13:17:52 +01:00
Vincent Breitmoser 7ad8977cf3 move some placeholders into resources 2014-03-08 12:28:20 +01:00
Vincent Breitmoser aa8a8f069f Normalize public key uri in KeyListFragment
Find the explicit row id of the public key id given in the uri in
KeyListFragment and work with that. This way, passing in uris by
master key id, mail address, or any other criteria, works.

Might be a good idea to add an actual check if the row id is non-zero
here, but not sure how to do a "bad intent" thing
2014-03-08 12:07:20 +01:00
Vincent Breitmoser 191c5b8130 Make EditKeyActivity's uri handling (more) sane
This activity didn't actually use the uri for anything, but just chopped
off the last path segment and interpreted it as row id. What the hell.
2014-03-08 11:58:26 +01:00
Vincent Breitmoser 8c6cb8b0ab working unified list (no actions yet) 2014-03-08 11:19:34 +01:00
Vincent Breitmoser 4851f7f8fc copy public keylist as stub for unified keylist 2014-03-06 01:32:18 +01:00