Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Replace wildcard imports with explicit imports | Thialfihar | 2014-04-02 | 1 | -1/+5 |
| | |||||
* | Rearrange too long lines | Thialfihar | 2014-04-02 | 1 | -1/+3 |
| | |||||
* | Adjust variable/member naming to conform to style guide | Thialfihar | 2014-04-02 | 5 | -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 guide | Thialfihar | 2014-04-02 | 2 | -8/+9 |
| | |||||
* | Adjust import order | Thialfihar | 2014-04-02 | 3 | -6/+0 |
| | |||||
* | Decrypt mostly works again | Dominik Schürmann | 2014-03-30 | 1 | -2/+2 |
| | |||||
* | Experiments with fragments in decrypt activity | Dominik Schürmann | 2014-03-30 | 2 | -6/+80 |
| | |||||
* | fix capability icons and remove red text for revoked keys | uberspot | 2014-03-26 | 1 | -4/+0 |
| | |||||
* | add strike through text for revoked or expired keys and disable views for ↵ | uberspot | 2014-03-26 | 1 | -4/+19 |
| | | | | revoked keys as well | ||||
* | Display expiry of subkeys in single key view. | Alexander Sulfrian | 2014-03-25 | 1 | -0/+22 |
| | |||||
* | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 1 | -1/+1 |
| | |||||
* | put colorize method into key helper | Dominik Schürmann | 2014-03-20 | 1 | -1/+1 |
| | |||||
* | colorize fingerprint in import | Dominik Schürmann | 2014-03-20 | 1 | -1/+3 |
| | |||||
* | Use getter and setter | Dominik Schürmann | 2014-03-20 | 2 | -28/+94 |
| | |||||
* | Dont try to parse key/fingerprint result from keyserver query | Dominik Schürmann | 2014-03-20 | 2 | -23/+26 |
| | |||||
* | Fix key list views in main key view | Thialfihar | 2014-03-20 | 1 | -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 display | uberspot | 2014-03-19 | 2 | -2/+2 |
| | |||||
* | Merge pull request #434 from honnel/revocation-status | Dominik Schürmann | 2014-03-18 | 1 | -1/+12 |
|\ | | | | | Show revocation status in ViewKeyKeysAdapter #375 | ||||
| * | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 1 | -1/+12 |
| | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring) | ||||
* | | Merge pull request #424 from gogowitczak/mro-branch | Dominik Schürmann | 2014-03-18 | 1 | -15/+27 |
|\ \ | | | | | | | Machine readable output for Keyserver query | ||||
| * | | Fixed coding style. | gogowitczak | 2014-03-18 | 1 | -26/+23 |
| | | | |||||
| * | | Keyserver query now uses machine readable output for search and get. Added ↵ | gogowitczak | 2014-03-15 | 1 | -15/+30 |
| |/ | | | | | | | separate function for converting algorithm integer ID to String. | ||||
* / | certify: viewkeyuseridsadapter cosmetics and checkbox capability | Vincent Breitmoser | 2014-03-15 | 1 | -6/+75 |
|/ | |||||
* | Fix two bugs in ImportKeys screen (issue #416) | uberspot | 2014-03-14 | 2 | -0/+2 |
| | |||||
* | more code style changes in /ui and /util | uberspot | 2014-03-13 | 8 | -91/+111 |
| | |||||
* | First code style changes in ui | uberspot | 2014-03-13 | 10 | -54/+45 |
| | |||||
* | Merge branch 'unified-keylist' | Vincent Breitmoser | 2014-03-12 | 2 | -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 activities | Vincent Breitmoser | 2014-03-08 | 2 | -371/+0 |
| | | |||||
| * | working unified list (no actions yet) | Vincent Breitmoser | 2014-03-08 | 1 | -232/+0 |
| | | |||||
| * | copy public keylist as stub for unified keylist | Vincent Breitmoser | 2014-03-06 | 1 | -0/+232 |
| | | |||||
* | | fix plenty of lint warnings, make some for loops into foreach, remove unused ↵ | uberspot | 2014-03-11 | 2 | -3/+0 |
| | | | | | | | | imports and throw exceptions | ||||
* | | Merge pull request #383 from sreeram-boyapati/master | Dominik Schürmann | 2014-03-10 | 1 | -26/+39 |
|\ \ | | | | | | | Fix to passphrase dialog and Issue #207 | ||||
| * | | ViewHolder Pattern Implemented | Sreeram Boyapati | 2014-03-10 | 1 | -26/+39 |
| | | | |||||
* | | | Make code more tidy for multiselect | Dominik Schürmann | 2014-03-10 | 2 | -19/+1 |
| | | | |||||
* | | | Improve hightlight query code: make cursor abstract, tidy up code | Dominik Schürmann | 2014-03-10 | 4 | -55/+51 |
| | | | |||||
* | | | Merge pull request #384 from mb-14/search1 | Dominik Schürmann | 2014-03-10 | 3 | -7/+77 |
|\ \ \ | | | | | | | | | Highlight search query in SelectPublicKeyFragment and KeyListPublicFragment | ||||
| * \ \ | Merge remote-tracking branch 'upstream/master' into search1 | Miroojin Bakshi | 2014-03-10 | 1 | -0/+3 |
| |\ \ \ | |||||
| * | | | | Create custom HighlightQueryCursorAdapter | Miroojin Bakshi | 2014-03-10 | 3 | -68/+70 |
| | | | | | |||||
| * | | | | Highlight search query in SelectPublicKeyFragment and | Miroojin Bakshi | 2014-03-10 | 2 | -2/+70 |
| | | | | | | | | | | | | | | | | | | | | KeyListPublicFragment | ||||
* | | | | | Cleanup ImportKeysListEntry | Dominik Schürmann | 2014-03-10 | 1 | -4/+6 |
| |/ / / |/| | | | |||||
* | | | | Issue #378 ( private keys are no longer red ): Fixed | Tharindu Wijewardane | 2014-03-10 | 1 | -0/+3 |
|/ / / | |||||
* | | | Fix key id and fingerprint handling, use full key ids | Dominik Schürmann | 2014-03-09 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #316 from danielhass/import-error | Dominik Schürmann | 2014-03-08 | 1 | -0/+34 |
|\ \ \ | |/ / |/| | | Show error if file import has no content | ||||
| * | | Fixed some naming | Daniel Haß | 2014-03-04 | 1 | -7/+7 |
| | | | |||||
| * | | Added handling for other exceptions in the ImportListLoader. | Daniel Haß | 2014-03-03 | 1 | -4/+21 |
| | | | |||||
| * | | Little fixes | Daniel Haß | 2014-03-03 | 1 | -1/+1 |
| | | | |||||
| * | | Added exception for empty files | Daniel Haß | 2014-03-03 | 1 | -1/+17 |
| |/ | |||||
* | | removed useless semicolons, fixed some parameters in documenation, ↵ | uberspot | 2014-03-07 | 1 | -3/+1 |
| | | | | | | | | simplified some conditionals | ||||
* | | remove unused imports and unthrown exceptions | uberspot | 2014-03-07 | 2 | -3/+1 |
| | | |||||
* | | Merge pull request #344 from ankushb92/ankush2 | Dominik Schürmann | 2014-03-06 | 1 | -1/+1 |
|\ \ | | | | | | | #338 |