cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,322 Commits 1 Branch 0 Tags
a73e91c49c96f950bcd1892a738558cbbb523741
Commit Graph
30 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 a9c9b6132c Merge branch 'master' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
 2014-03-12 23:45:21 +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 edb98c67f4 add certify action button to viewkeymainfragment 2014-03-12 03:10:46 +01:00
Vincent Breitmoser 3d8d22c9ed add empty view to viewkeycertsfragment 2014-03-12 02:47:19 +01:00
Vincent Breitmoser 20193e0992 add menu to viewcertactivity 2014-03-12 02:30:49 +01:00
Vincent Breitmoser 84598dd665 add view cert activity 2014-03-12 02:25:48 +01:00
Vincent Breitmoser 57873650b1 forgot to commit two layout files 2014-03-11 03:19:41 +01:00
Vincent Breitmoser 3ed93b7671 add "show unknown signatures" button 2014-03-11 03:19:12 +01:00
Vincent Breitmoser 8b4a63d5c4 add keys we don't know about, just for fun 2014-03-11 02:40:57 +01:00
Vincent Breitmoser 74027abdad experimental cert list, proper 2014-03-11 02:40:41 +01:00
Vincent Breitmoser 3b38ffe55e experimental cert display 2014-03-11 00:14:38 +01:00
Vincent Breitmoser 7a8db90425 join cert info into query routines 2014-03-11 00:14:04 +01:00
Vincent Breitmoser ba7613dc34 experimental cert import 2014-03-11 00:13:03 +01:00
Vincent Breitmoser 74f8ec0365 certs: close in from both sides :) 2014-03-11 00:11:27 +01:00
Vincent Breitmoser 535f2caf2c (preliminary) certs table 2014-03-11 00:09:11 +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