aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter
Commit message (Collapse)AuthorAgeFilesLines
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-0612-1661/+0
|
* certs: fix CertifyKeyActivity and improve user id listVincent Breitmoser2014-04-061-8/+17
|
* certs: display uid status in uid listVincent Breitmoser2014-04-061-10/+20
|
* certs: various improvementsVincent Breitmoser2014-04-051-4/+5
| | | | | | | * recognize self-certifications * save signature type * save expiry time * drop encoded data blob from db
* certs: more fixes, almost working nowVincent Breitmoser2014-04-051-4/+6
|
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-059-89/+322
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ↵Dominik Schürmann2014-04-031-3/+3
| |\ | | | | | | | | | Valodim-db-overhaul
| | * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-037-29/+30
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-031-3/+25
| | |/ | |/|
| * | Replace wildcard imports with explicit importsThialfihar2014-04-021-1/+5
| | |
| * | Rearrange too long linesThialfihar2014-04-021-1/+3
| | |
| * | Adjust variable/member naming to conform to style guideThialfihar2014-04-025-13/+13
| | | | | | | | | | | | | | | In some cases change member accessibility, so the naming matches. Also, some key words were reordered to comply with JLS suggestions.
| * | Trivial spacing changes to conform to style guideThialfihar2014-04-022-8/+9
| | |
| * | Adjust import orderThialfihar2014-04-023-6/+0
| |/
| * Decrypt mostly works againDominik Schürmann2014-03-301-2/+2
| |
| * Experiments with fragments in decrypt activityDominik Schürmann2014-03-302-6/+80
| |
| * fix capability icons and remove red text for revoked keysuberspot2014-03-261-4/+0
| |
| * add strike through text for revoked or expired keys and disable views for ↵uberspot2014-03-261-4/+19
| | | | | | | | revoked keys as well
| * Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-0/+22
| |
| * Fix fingerprint handlingDominik Schürmann2014-03-201-1/+1
| |
| * put colorize method into key helperDominik Schürmann2014-03-201-1/+1
| |
| * colorize fingerprint in importDominik Schürmann2014-03-201-1/+3
| |
| * Use getter and setterDominik Schürmann2014-03-202-28/+94
| |
| * Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-202-23/+26
| |
| * Fix key list views in main key viewThialfihar2014-03-201-1/+11
| | | | | | | | | | | | | | Since the views are being reused, a revoked key might set the text color of a view and when the view is being reused for a non-revoked key it is still red. So grab the default text colour and set it explicitly when the key is not revoked.
| * add apg's fix for Key id displayuberspot2014-03-192-2/+2
| |
| * Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-181-1/+12
| |\ | | | | | | Show revocation status in ViewKeyKeysAdapter #375
| | * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-181-1/+12
| | | | | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
| * | Merge pull request #424 from gogowitczak/mro-branchDominik Schürmann2014-03-181-15/+27
| |\ \ | | | | | | | | Machine readable output for Keyserver query
| | * | Fixed coding style.gogowitczak2014-03-181-26/+23
| | | |
| | * | Keyserver query now uses machine readable output for search and get. Added ↵gogowitczak2014-03-151-15/+30
| | |/ | | | | | | | | | separate function for converting algorithm integer ID to String.
* | | certs: more filters, better initial uid selection, code cosmeticsVincent Breitmoser2014-03-171-3/+6
| | | | | | | | | | | | | | | | | | | | | - add three types of filters for certificate list (ui looks like crap there, need to work on that) - select uncertified uids by default in CertifyKeyActivity - move some code around in KeychainProvider, 's slightly less hacky now
* | | certs: green dots for verified status \o/Vincent Breitmoser2014-03-151-2/+10
| | |
* | | Merge branch 'certify' into certsVincent Breitmoser2014-03-151-6/+75
|\| | | | | | | | | | | | | | | | | | | | Conflicts: 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/values/strings.xml
| * | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-151-6/+75
| |/
* | Merge branch 'master' into certsVincent Breitmoser2014-03-1511-145/+158
|\| | | | | | | | | | | | | | | | | | | 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
| * Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
| |
| * more code style changes in /ui and /utiluberspot2014-03-138-91/+111
| |
| * First code style changes in uiuberspot2014-03-1310-54/+45
| |
* | Merge branch 'master' into certsVincent Breitmoser2014-03-126-37/+151
|\| | | | | | | | | | | 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-122-350/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵uberspot2014-03-112-3/+0
| | | | | | | | | | | | imports and throw exceptions
| * | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-101-26/+39
| |\ \ | | | | | | | | Fix to passphrase dialog and Issue #207
| | * | ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| | | |
| * | | Make code more tidy for multiselectDominik Schürmann2014-03-102-19/+1
| | | |
| * | | Improve hightlight query code: make cursor abstract, tidy up codeDominik Schürmann2014-03-104-55/+51
| | | |
| * | | Merge pull request #384 from mb-14/search1Dominik Schürmann2014-03-103-7/+77
| |\ \ \ | | | | | | | | | | Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment
| | * \ \ Merge remote-tracking branch 'upstream/master' into search1Miroojin Bakshi2014-03-101-0/+3
| | |\ \ \
| | * | | | Create custom HighlightQueryCursorAdapterMiroojin Bakshi2014-03-103-68/+70
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 22:51:53 +0000