Commit Graph

20 Commits

Author SHA1 Message Date
Thialfihar 77a6c509f7 Replace wildcard imports with explicit imports 2014-04-02 13:37:12 +02:00
Thialfihar 82e5d14fb1 Rearrange too long lines 2014-04-02 10:51:02 +02:00
Thialfihar dd4a1e3f52 Trivial spacing changes to conform to style guide 2014-04-02 10:51:02 +02:00
Dominik Schürmann cc8fd35137 Show divider only when used 2014-03-26 18:34:48 +01:00
Nikhil Peter Raj 2816461283 Fix for #410 2014-03-21 01:50:20 +05:30
uberspot e387dd7c54 Fix export for new unified key list #409 2014-03-15 01:51:01 +02:00
uberspot 6ac4d6c218 final ui code style changes 2014-03-13 21:39:14 +02:00
uberspot dc5c34ffc5 More code style fixes for /ui 2014-03-13 21:30:56 +02:00
uberspot ad1e047aa9 First code style changes in ui 2014-03-13 20:25:01 +02:00
Dominik Schürmann 471cefa71f Cleanup and simplification 2014-03-13 18:27:08 +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 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 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 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