aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* / certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-151-6/+75
|/
* 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 '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
| * ditch old key list activitiesVincent Breitmoser2014-03-082-371/+0
| |
| * working unified list (no actions yet)Vincent Breitmoser2014-03-081-232/+0
| |
| * copy public keylist as stub for unified keylistVincent Breitmoser2014-03-061-0/+232
| |
* | 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
| | | | |
| * | | | Highlight search query in SelectPublicKeyFragment andMiroojin Bakshi2014-03-102-2/+70
| | | | | | | | | | | | | | | | | | | | KeyListPublicFragment
* | | | | Cleanup ImportKeysListEntryDominik Schürmann2014-03-101-4/+6
| |/ / / |/| | |
* | | | Issue #378 ( private keys are no longer red ): FixedTharindu Wijewardane2014-03-101-0/+3
|/ / /
* | | Fix key id and fingerprint handling, use full key idsDominik Schürmann2014-03-092-2/+2
| | |
* | | Merge pull request #316 from danielhass/import-errorDominik Schürmann2014-03-081-0/+34
|\ \ \ | |/ / |/| | Show error if file import has no content
| * | Fixed some namingDaniel Haß2014-03-041-7/+7
| | |
| * | Added handling for other exceptions in the ImportListLoader.Daniel Haß2014-03-031-4/+21
| | |
| * | Little fixesDaniel Haß2014-03-031-1/+1
| | |
| * | Added exception for empty filesDaniel Haß2014-03-031-1/+17
| |/
* | removed useless semicolons, fixed some parameters in documenation, ↵uberspot2014-03-071-3/+1
| | | | | | | | simplified some conditionals
* | remove unused imports and unthrown exceptionsuberspot2014-03-072-3/+1
| |
* | Merge pull request #344 from ankushb92/ankush2Dominik Schürmann2014-03-061-1/+1
|\ \ | | | | | | #338