aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-0/+75
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * working unified list (no actions yet)Vincent Breitmoser2014-03-081-0/+75
| |
* | removed useless semicolons, fixed some parameters in documenation, ↵uberspot2014-03-071-2/+3
|/ | | | simplified some conditionals
* Show revoked status in key listDominik Schürmann2014-02-041-0/+2
|
* No bouncy castle objects in key viewDominik Schürmann2014-02-011-2/+3
|
* Fix layout, add API notes to README, register fingerprint URIs, some ↵Dominik Schürmann2014-02-011-369/+377
| | | | reformatting (sry)
* New Gradle project structureDominik Schürmann2014-01-271-0/+971