aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Simplify dialogs according to Material DesignDominik Schürmann2015-03-043-17/+13
|
* Merge pull request #1080 from indrora/avoid-large-log-parcelsVincent2015-03-041-6/+63
|\ | | | | Fix root cause of #1077
| * Cleanup for styleMorgan Gangwere2015-03-031-13/+6
| | | | | | | | Some nitpicks were had. Also, change the null UUID to a constant.
| * Fix root cause of #1077Morgan Gangwere2015-03-031-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 developmentDominik Schürmann2015-03-03249-44/+71
|\ \
| * | Merge branch 'development' of https://github.com/vectorijk/open-keychain ↵Dominik Schürmann2015-03-03249-44/+71
|/| | | | | | | | | | | into vectorijk-development
| * | if needed change name options.templ.jsonjiangkai2015-03-032-1/+4
| | |
| * | icon name changes in UI filesjiangkai2015-03-032-2/+2
| | |
| * | delete holo iconsjiangkai2015-03-0395-0/+0
| | |
| * | change icon name in layout filesjiangkai2015-03-0324-40/+40
| | |
| * | download new material design iconsjiangkai2015-03-03125-0/+0
| | |
| * | get more material icon scriptjiangkai2015-03-031-1/+25
| | |
* | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
| | |
* | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-031-1/+3
|\ \ \ | | | | | | | | | | | | development
| * \ \ Merge pull request #1089 from ishan1604/submodulesfixDominik Schürmann2015-03-031-1/+3
| |\ \ \ | | | | | | | | | | Submodulesfix
| | * | | Fixed Spacing issueIshan Khanna2015-03-041-3/+3
| | | | |
| | * | | This edit prevents some modules from throwing untracked content warning in gitIshan Khanna2015-03-041-1/+3
| | | |/ | | |/|
* | | | Fix expiry dialog, reorder layoutsDominik Schürmann2015-03-035-63/+93
| | | |
* | | | Prettify passphrase dialog, it no longer resizes on unlocking the keyDominik Schürmann2015-03-032-33/+43
|/ / /
* | | Fix toolbar margins on Android lower 5Dominik Schürmann2015-03-039-9/+8
| | |
* | | Use spinner DatePicker, not full calendar, also on Android 5Dominik Schürmann2015-03-032-37/+59
| |/ |/|
* | Update patternview lib, remove workaroundDominik Schürmann2015-03-032-13/+11
| |
* | Remove old min sdk checkDominik Schürmann2015-03-031-3/+1
| |
* | Merge pull request #1082 from ishan1604/bug-1081Dominik Schürmann2015-03-031-3/+0
|\ \ | |/ |/| Fixes Issue #1081
| * Fixes Issue #1081Ishan Khanna2015-03-031-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.gradleDominik Schürmann2015-03-031-2/+0
| |
* | Revert "rescale qr code bitmap in background"Dominik Schürmann2015-03-031-6/+7
| | | | | | | | | | | | size of view may not be available in background thread. This reverts commit 7e4c39c79d1adb58f3181c9674309b1faaecc864.
* | Cleanup of contact sync, debuggingDominik Schürmann2015-03-032-94/+126
|/
* Reorder build.gradleDominik Schürmann2015-03-021-10/+14
|
* rescale qr code bitmap in backgroundVincent Breitmoser2015-03-021-7/+6
|
* Update API libDominik Schürmann2015-03-021-0/+0
|
* forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-021-0/+4
|\ | | | | | | development
| * README: mac os x workaroundDominik Schürmann2015-03-021-0/+4
| |
* | some cleanup in ViewKey*Vincent Breitmoser2015-03-022-18/+20
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-0217-41/+100
|\| | | | | | | development
| * Search string simplifiedDominik Schürmann2015-03-021-2/+1
| |
| * Use gradle witnessDominik Schürmann2015-03-024-2/+37
| |
| * Update readme for build systemDominik Schürmann2015-03-021-7/+5
| |
| * Re-add black colorDominik Schürmann2015-03-021-0/+2
| |
| * Remove supertoast dependencyDominik Schürmann2015-03-021-1/+0
| |
| * Removed unused submodulesDominik Schürmann2015-03-024-9/+0
| |
| * Use SDK and build tools versions from root projectDominik Schürmann2015-03-0210-14/+36
| |
| * Revert "Gradle hack to always use same build tools in subprojects"Dominik Schürmann2015-03-022-32/+1
| | | | | | | | This reverts commit fab60f2ddb4917515570f7c60a1be22670cd836e.
| * Gradle hack to always use same build tools in subprojectsDominik Schürmann2015-03-022-1/+32
| |
| * Use index constants in ContactHelperDominik Schürmann2015-03-021-7/+20
| |
* | don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
| |
* | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-026-122/+162
| |
* | fix a couple lint errorsVincent Breitmoser2015-02-282-4/+5
|/
* some changes to qr scan logicVincent Breitmoser2015-02-284-37/+113
|