| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | 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 | |||||
| * | | | | | | | | | | Fix status bar orange | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | More simplification of delete strings | Dominik Schürmann | 2015-03-04 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #1097 from ishan1604/orange-toolbar | Dominik Schürmann | 2015-03-04 | 3 | -2/+33 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Orange toolbar for certify and fingerprint activity added | |||||
| | * | | | | | | | | | | Orange Toolbar Added Fixes #1088 | Ishan Khanna | 2015-03-04 | 5 | -44/+33 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Fixes Issue#1088 | Ishan Khanna | 2015-03-04 | 2 | -0/+42 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/development' into development | Ishan Khanna | 2015-03-04 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/development' into development | Ishan Khanna | 2015-03-04 | 15 | -65/+79 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | | Fixed Submodules | Ishan Khanna | 2015-03-04 | 1 | -0/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Simplify certify strings | Dominik Schürmann | 2015-03-04 | 1 | -11/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 3 | -17/+13 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | 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 'vectorijk-development' into development | Dominik Schürmann | 2015-03-03 | 249 | -44/+71 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵ | Dominik Schürmann | 2015-03-03 | 249 | -44/+71 | |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development | |||||
| | * | | | | | | | | | | | | if needed change name options.templ.json | jiangkai | 2015-03-03 | 2 | -1/+4 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | icon name changes in UI files | jiangkai | 2015-03-03 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | delete holo icons | jiangkai | 2015-03-03 | 95 | -0/+0 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | change icon name in layout files | jiangkai | 2015-03-03 | 24 | -40/+40 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | download new material design icons | jiangkai | 2015-03-03 | 125 | -0/+0 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | get more material icon script | jiangkai | 2015-03-03 | 1 | -1/+25 | |
| | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Show name only in passphrase dialog | Dominik Schürmann | 2015-03-03 | 2 | -1/+25 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-03-03 | 1 | -1/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | | | | | | | | Merge pull request #1089 from ishan1604/submodulesfix | Dominik Schürmann | 2015-03-03 | 1 | -1/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | Submodulesfix | |||||
| | | * | | | | | | | | | | Fixed Spacing issue | Ishan Khanna | 2015-03-04 | 1 | -3/+3 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | This edit prevents some modules from throwing untracked content warning in git | Ishan Khanna | 2015-03-04 | 1 | -1/+3 | |
| | | | |/ / / / / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 5 | -63/+93 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Prettify passphrase dialog, it no longer resizes on unlocking the key | Dominik Schürmann | 2015-03-03 | 2 | -33/+43 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Fix toolbar margins on Android lower 5 | Dominik Schürmann | 2015-03-03 | 9 | -9/+8 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Use spinner DatePicker, not full calendar, also on Android 5 | Dominik Schürmann | 2015-03-03 | 2 | -37/+59 | |
| | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | | Update patternview lib, remove workaround | Dominik Schürmann | 2015-03-03 | 2 | -13/+11 | |
| | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| * | | | | | | | | 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. | |||||
| * | | | | | | | | Cleanup settings.gradle | Dominik Schürmann | 2015-03-03 | 1 | -2/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | 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 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Reorder build.gradle | Dominik Schürmann | 2015-03-02 | 1 | -10/+14 | |
| | | | | | | | | ||||||
| * | | | | | | | rescale qr code bitmap in background | Vincent Breitmoser | 2015-03-02 | 1 | -7/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Update API lib | Dominik Schürmann | 2015-03-02 | 1 | -0/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | forgot to rename a method | Vincent Breitmoser | 2015-03-02 | 2 | -4/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Vincent Breitmoser | 2015-03-02 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | development | |||||
| | * | | | | | | README: mac os x workaround | Dominik Schürmann | 2015-03-02 | 1 | -0/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | 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 | 17 | -41/+100 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | development | |||||
| | * | | | | | | Search string simplified | Dominik Schürmann | 2015-03-02 | 1 | -2/+1 | |
| | | | | | | | | ||||||
| | * | | | | | | Use gradle witness | Dominik Schürmann | 2015-03-02 | 4 | -2/+37 | |
| | | | | | | | | ||||||
| | * | | | | | | Update readme for build system | Dominik Schürmann | 2015-03-02 | 1 | -7/+5 | |
| | | | | | | | | ||||||
| | * | | | | | | Re-add black color | Dominik Schürmann | 2015-03-02 | 1 | -0/+2 | |
| | | | | | | | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |