cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,334 Commits 1 Branch 0 Tags
fe3d6bafc3de784a17b552575dcf8811621bfb89
Commit Graph

28 Commits

Author SHA1 Message Date
Vincent Breitmoser
49984846d5 certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha) 2014-03-15 18:20:49 +01:00
uberspot
2d0817bd74 final code style changes 2014-03-13 23:03:20 +02:00
uberspot
6ac4d6c218 final ui code style changes 2014-03-13 21:39:14 +02:00
Dominik Schürmann
471cefa71f Cleanup and simplification 2014-03-13 18:27:08 +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
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
uberspot
361c45a481 Make export work with rowIds instead of MasterKeyIds 2014-03-11 03:22:05 +02:00
uberspot
059e57c5d0 Colorize fingerprint 2014-03-09 04:14:23 +02:00
Dominik Schürmann
5b255a263f Fix key id and fingerprint handling, use full key ids 2014-03-09 01:49:25 +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
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
uberspot
477d06c43a removed useless semicolons, fixed some parameters in documenation, simplified some conditionals 2014-03-07 22:35:49 +02:00
uberspot
ca851ba21f remove unused imports and unthrown exceptions 2014-03-07 22:35:49 +02:00
Ankush
8e29b82d6d corrected commit 
mCurrentPassPhrase, mChangePassPhrase

Minor variable naming Issue #338
 2014-03-07 00:43:09 +05:30
Dominik Schürmann
0c4b809195 rework key view into fragments to later add certifications 2014-02-09 21:17:30 +01:00
Dominik Schürmann
616c903a2a do not delete pub keys where secret key exists 2014-02-06 01:02:18 +01:00
Dominik Schürmann
a41228fc06 changelog 2014-02-05 19:58:30 +01:00
Dominik Schürmann
cf499462c5 Hotfix for database upgrade, version 2.3.1 2014-02-05 19:55:32 +01:00
Dominik Schürmann
c434c426e7 Show revoked status in key list 2014-02-04 15:01:50 +01:00
Dominik Schürmann
b87f0b2658 save fingerprint on save 2014-02-01 16:35:53 +01:00
Dominik Schürmann
c4340b2379 No bouncy castle objects in key view 2014-02-01 16:34:42 +01:00
Dominik Schürmann
5359205b50 Fix layout, add API notes to README, register fingerprint URIs, some reformatting (sry) 2014-02-01 16:17:33 +01:00
Dominik Schürmann
f276455624 save keyring in-place, fixes #228, #203 2014-01-29 03:06:26 +01:00
Dominik Schürmann
cb3ca37db9 New Gradle project structure 2014-01-27 14:18:25 +01:00