aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
Commit message (Collapse)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-061-700/+0
|
* certs: display green dot for certified keys in KeyListFragmentVincent Breitmoser2014-04-061-3/+16
|
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-061-1/+1
|\ | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * Remove import activity from drawer, make it reachable from key list onlyDominik Schürmann2014-04-051-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-051-70/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of things are completely broken, but it compiles and doesn't crash right away. Good enough for me. Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java 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/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
| * db-overhaul: fix key export (and some export-related ui changes)Vincent Breitmoser2014-04-041-6/+17
| |
| * db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-041-3/+3
| |
| * db-overhaul: minor stuff, mostly ProviderHelperVincent Breitmoser2014-04-041-4/+1
| |
| * db-overhaul: more work on new providerVincent Breitmoser2014-04-031-26/+16
| | | | | | | | | | | | | | | | | | | | specifics: - secret keys are preserved when a new public key is inserted - started work to give virtual columns a representation in the contract class - streamline ProviderHelper methods. the getUnifiedData method relies on a api level 11 method, not sure yet how to fix/workaround that... - many more small things work as they did before
| * more work on streamlining uris, and stripping ProviderHelperVincent Breitmoser2014-04-031-20/+7
| |
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-031-5/+21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * Replace wildcard imports with explicit importsThialfihar2014-04-021-3/+17
| | |
| | * Rearrange too long linesThialfihar2014-04-021-3/+6
| | |
| | * Trivial spacing changes to conform to style guideThialfihar2014-04-021-1/+1
| | |
| * | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-15/+16
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change entire database design. This introduces a lot of changes, notably all URIs and almost all projections. Some features (like key deletion) have been simply commented out for now since they need serious reconsideration. There are a couple of new TODOs marking places where more work is needed. The migration path works fine from what I tested. The old database is not deleted for now, ie, it is reimported at every start of the application making all intermediate changes transient. Tested and working (for me): - All activities in the main drawer - Multiselect and Search - ViewKeyActivity, with and without secret key available - CertifyKeyActivity - SelectSecretKeyActivity (from CertifyKeyActivity) - SelectPublicKeyActivity (from encrypt activity) What doesn't work: - Actually certifying keys (pending a TODO in ProviderHelper) - Importing keys doesn't preserve secret keys - "Encrypt to this contact" doesn't pass key - Editing keys. All controls are disabled, I'm not sure why... (is this even my fault?) - Deleting keys What I didn't test: - Key export - API stuff - Creating keys (since editing doesn't even work)
| * Show divider only when usedDominik Schürmann2014-03-261-0/+6
| |
| * Fix for #410Nikhil Peter Raj2014-03-211-20/+2
| |
| * Fix export for new unified key list #409uberspot2014-03-151-4/+14
| |
* | Merge branch 'master' into certsVincent Breitmoser2014-03-151-141/+90
|\| | | | | | | | | | | | | | | | | | | 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
| * final ui code style changesuberspot2014-03-131-1/+1
| |
| * More code style fixes for /uiuberspot2014-03-131-10/+24
| |
| * First code style changes in uiuberspot2014-03-131-48/+31
| |
| * Cleanup and simplificationDominik Schürmann2014-03-131-60/+23
| |
| * merge fixes as per comments in mergeVincent Breitmoser2014-03-131-30/+19
| | | | | | | | https://github.com/openpgp-keychain/openpgp-keychain/pull/403/files#r10540753
| * keychainprovider cleanup, kindasortaVincent Breitmoser2014-03-131-1/+6
| | | | | | | | | | removed code redundancy, and the query is in the switch thing now, I didn't put everything into its own separate sources (yet?).
* | Merge branch 'master' into certsVincent Breitmoser2014-03-121-42/+169
|\| | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
| * Merge branch 'unified-keylist'Vincent Breitmoser2014-03-121-42/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | certs: close in from both sides :)Vincent Breitmoser2014-03-111-5/+11
|/
* add contact count to My Keys headerVincent Breitmoser2014-03-081-1/+10
|
* better handling of multi select in ListKeysFragmentVincent Breitmoser2014-03-081-17/+22
|
* add edit button and secret key info to public key viewVincent Breitmoser2014-03-081-1/+0
|
* move some placeholders into resourcesVincent Breitmoser2014-03-081-2/+1
|
* Normalize public key uri in KeyListFragmentVincent Breitmoser2014-03-081-5/+1
| | | | | | | | | 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
* working unified list (no actions yet)Vincent Breitmoser2014-03-081-7/+268
|
* copy public keylist as stub for unified keylistVincent Breitmoser2014-03-061-0/+338