| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #1101 from danielnelz/development | Dominik Schürmann | 2015-03-04 | 13 | -70/+85 |
| |\ | | | | | #1042 replaced some int constants with enums | ||||
| | * | #1042 replaced some int constants with enums | Daniel Nelz | 2015-03-04 | 13 | -70/+85 |
| | | | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them | ||||
| * | | Show fingerprint menu item only if not revoked or expired | Dominik Schürmann | 2015-03-04 | 1 | -9/+12 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 2 | -2/+203 |
| |\ \ | | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml | ||||
| | * | | corrected code style | Adithya Abraham Philip | 2015-03-04 | 1 | -58/+75 |
| | | | | |||||
| | * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-03-02 | 1 | -7/+20 |
| | |\ \ | | | | | | | | | | | | | into development | ||||
| | * | | | supports sub logs in log export | Adithya Abraham Philip | 2015-03-01 | 1 | -68/+55 |
| | | | | | |||||
| | * | | | added logging, notify for log export | Adithya Abraham Philip | 2015-03-01 | 2 | -20/+59 |
| | | | | | |||||
| | * | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 4 | -37/+113 |
| | |\ \ \ | | | | | | | | | | | | | | | | into development | ||||
| | * \ \ \ | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 15 | -380/+375 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | into development | ||||
| | * | | | | | cleaned up log export | Adithya Abraham Philip | 2015-02-28 | 1 | -20/+9 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Adithya Abraham Philip | 2015-02-28 | 24 | -463/+1033 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into development | ||||
| | * | | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 |
| | | | | | | | | |||||
| | * | | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 44 | -1603/+1931 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 1 | -0/+102 |
| | | | | | | | | | |||||
| * | | | | | | | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 2 | -16/+16 |
| | | | | | | | | | |||||
| * | | | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 2 | -17/+8 |
| | | | | | | | | | |||||
| * | | | | | | | | Get high res version of contact photo | Dominik Schürmann | 2015-03-04 | 3 | -6/+7 |
| | | | | | | | | | |||||
| * | | | | | | | | Crop image view to center | Dominik Schürmann | 2015-03-04 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 1 | -7/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | ContactHelper cleanup | Dominik Schürmann | 2015-03-04 | 2 | -34/+41 |
| | | | | | | | | | |||||
| * | | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵ | Dominik Schürmann | 2015-03-04 | 9 | -119/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EXPIRY where possible | ||||
| * | | | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 2 | -13/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1080 from indrora/avoid-large-log-parcels | Vincent | 2015-03-04 | 1 | -6/+63 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix root cause of #1077 | ||||
| | * | | | | | | | | Cleanup for style | Morgan Gangwere | 2015-03-03 | 1 | -13/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant. | ||||
| | * | | | | | | | | Fix root cause of #1077 | Morgan Gangwere | 2015-03-03 | 1 | -6/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When importing lots of keys, lots of messages about the status of keys is generated, including some debug slime and general fluff that isn't really needed a lot of the time. As a result, a serious bug can come along after key imports or certain operations which cause a log to become parceled. This commit implements a pool to "dehydrate" logs into: they are placed into the pool (a ConcurrentHashMap) and a UUID assigned to them, which is parceled along. When the OperationResult is un-parceled, it reads in the appropriate UUID bits and rehydrates the appropriate log. In order to avoid any memory leaks, the log pool removes a reference to the log itself, allowing the log to die a natural death at the hands of the GC.. | ||||
| * | | | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵ | Dominik Schürmann | 2015-03-03 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development | ||||
| | * | | | | | | | | | icon name changes in UI files | jiangkai | 2015-03-03 | 2 | -2/+2 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | | Show name only in passphrase dialog | Dominik Schürmann | 2015-03-03 | 2 | -1/+25 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 3 | -44/+47 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 1 | -24/+25 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Remove old min sdk check | Dominik Schürmann | 2015-03-03 | 1 | -3/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #1082 from ishan1604/bug-1081 | Dominik Schürmann | 2015-03-03 | 1 | -3/+0 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Fixes Issue #1081 | ||||
| | * | | | | | | | Fixes Issue #1081 | Ishan Khanna | 2015-03-03 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The App crashed because the Adapter was trying to call a method on a null object. Where was the null object? CheckBox was null because in the Layout file view_key_adv_user_id_item.xml There is no such widget with id = user_id_item_check_box Fix : I removed the two lines which were causing the bug, and now the screen loads perfectly. | ||||
| * | | | | | | | | Revert "rescale qr code bitmap in background" | Dominik Schürmann | 2015-03-03 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size of view may not be available in background thread. This reverts commit 7e4c39c79d1adb58f3181c9674309b1faaecc864. | ||||
| * | | | | | | | | Cleanup of contact sync, debugging | Dominik Schürmann | 2015-03-03 | 2 | -94/+126 |
| |/ / / / / / / | |||||
| * | | | | | | | rescale qr code bitmap in background | Vincent Breitmoser | 2015-03-02 | 1 | -7/+6 |
| | | | | | | | | |||||
| * | | | | | | | forgot to rename a method | Vincent Breitmoser | 2015-03-02 | 2 | -4/+2 |
| | | | | | | | | |||||
| * | | | | | | | some cleanup in ViewKey* | Vincent Breitmoser | 2015-03-02 | 2 | -18/+20 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-03-02 | 1 | -7/+20 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | development | ||||
| | * | | | | | | Use index constants in ContactHelper | Dominik Schürmann | 2015-03-02 | 1 | -7/+20 |
| | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | | don't reload qr code for identical fingerprint | Vincent Breitmoser | 2015-03-02 | 1 | -1/+5 |
| | | | | | | | |||||
| * | | | | | | make userattributeadapter superclass of useridsadapter | Vincent Breitmoser | 2015-03-02 | 4 | -115/+143 |
| | | | | | | | |||||
| * | | | | | | fix a couple lint errors | Vincent Breitmoser | 2015-02-28 | 2 | -4/+5 |
| |/ / / / / | |||||
| * | | | / | some changes to qr scan logic | Vincent Breitmoser | 2015-02-28 | 4 | -37/+113 |
| | |_|_|/ |/| | | | |||||
| * | | | | pass through messenger to certify service from ViewKeyActivity | Vincent Breitmoser | 2015-02-28 | 4 | -49/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | | the idea here is to handle progress and result of the CertifyActivity directly in ViewKeyActivity by passing a messenger through to it. this allows smoother transition from an uncertified to certified state. | ||||
| * | | | | fab support for all notify types | Vincent Breitmoser | 2015-02-28 | 1 | -23/+29 |
| | | | | | |||||
| * | | | | small Notify cleanup | Vincent Breitmoser | 2015-02-28 | 1 | -24/+2 |
| | | | | | |||||
| * | | | | clean up warnings in KeyListFragment | Vincent Breitmoser | 2015-02-28 | 1 | -32/+10 |
| | | | | | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |