Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use material save icon | Dominik Schürmann | 2015-03-04 | 10 | -1/+1 |
| | |||||
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵ | Dominik Schürmann | 2015-03-04 | 8 | -2/+225 |
|\ | | | | | | | | | | | | | 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 | 3 | -9/+23 |
| |\ | | | | | | | | | | 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 | 3 | -20/+66 |
| | | | |||||
| * | | 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 | 73 | -834/+1671 |
| |\ \ \ | | | | | | | | | | | | | | | | 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 | 36 | -631/+1271 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into development | ||||
| * | | | | | refined log output | Adithya Abraham Philip | 2015-02-28 | 1 | -4/+71 |
| | | | | | | |||||
| * | | | | | merged dialog | Adithya Abraham Philip | 2015-02-26 | 659 | -3375/+6986 |
| |\ \ \ \ \ | |||||
| * | | | | | | initial Log Display function | Adithya Abraham Philip | 2015-02-26 | 7 | -0/+117 |
| | | | | | | | |||||
* | | | | | | | Set key signature algo from SHA512 to SHA256 | Dominik Schürmann | 2015-03-04 | 1 | -9/+10 |
| | | | | | | | |||||
* | | | | | | | Remove help button for now | Dominik Schürmann | 2015-03-04 | 6 | -15/+3 |
| | | | | | | | |||||
* | | | | | | | More icon naming fixes and design | Dominik Schürmann | 2015-03-04 | 23 | -56/+69 |
| | | | | | | | |||||
* | | | | | | | Partially fix file names | Dominik Schürmann | 2015-03-04 | 158 | -13/+13 |
| | | | | | | | |||||
* | | | | | | | Simplified language: Confirm keys | Dominik Schürmann | 2015-03-04 | 55 | -781/+82 |
| | | | | | | | |||||
* | | | | | | | Update lib list | Dominik Schürmann | 2015-03-04 | 1 | -7/+9 |
| | | | | | | | |||||
* | | | | | | | 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 | 2 | -7/+6 |
| | | | | | | | |||||
* | | | | | | | Full height contact pic in key view | Dominik Schürmann | 2015-03-04 | 2 | -8/+8 |
| | | | | | | | |||||
* | | | | | | | 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 | ||||
* | | | | | | | 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 |
| | | | | | | | | |||||
* | | | | | | | | 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 'development' of https://github.com/vectorijk/open-keychain ↵ | Dominik Schürmann | 2015-03-03 | 246 | -42/+42 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development | ||||
| * | | | | | | | | | 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 |
| | | | | | | | | | | |||||
* | | | | | | | | | | 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 | 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 | 1 | -2/+0 |
| | | | | | | | | |||||
* | | | | | | | | 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 |
|/ / / / / / / |