aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Better selection of preferred algorithmDominik Schürmann2015-03-0511-40/+99
|
* Merge pull request #1101 from danielnelz/developmentDominik Schürmann2015-03-0413-70/+85
|\ | | | | #1042 replaced some int constants with enums
| * #1042 replaced some int constants with enumsDaniel Nelz2015-03-0413-70/+85
| | | | | | | | | | Created enum FragAction in CreateKeyActivity.java and enum State in KeyFormattingUtils.java and replaced int constants with them
* | Rewording secret_key_deletion_confirmationDominik Schürmann2015-03-041-1/+1
| |
* | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| |
* | Use material save iconDominik Schürmann2015-03-0410-1/+1
| |
* | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-048-2/+225
|\ \ | | | | | | | | | | | | | | | | | | into adithyaphilip-development Conflicts: OpenKeychain/src/main/res/values/strings.xml
| * | corrected code styleAdithya Abraham Philip2015-03-041-58/+75
| | |
| * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-03-023-9/+23
| |\ \ | | | | | | | | | | | | into development
| * | | supports sub logs in log exportAdithya Abraham Philip2015-03-011-68/+55
| | | |
| * | | added logging, notify for log exportAdithya Abraham Philip2015-03-013-20/+66
| | | |
| * | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-284-37/+113
| |\ \ \ | | | | | | | | | | | | | | | into development
| * \ \ \ Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2873-834/+1671
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into development
| * | | | | cleaned up log exportAdithya Abraham Philip2015-02-281-20/+9
| | | | | |
| * | | | | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵Adithya Abraham Philip2015-02-2836-631/+1271
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into development
| * | | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
| | | | | | |
| * | | | | | merged dialogAdithya Abraham Philip2015-02-26659-3375/+6986
| |\ \ \ \ \ \
| * | | | | | | initial Log Display functionAdithya Abraham Philip2015-02-267-0/+117
| | | | | | | |
* | | | | | | | Set key signature algo from SHA512 to SHA256Dominik Schürmann2015-03-041-9/+10
| | | | | | | |
* | | | | | | | Remove help button for nowDominik Schürmann2015-03-046-15/+3
| | | | | | | |
* | | | | | | | More icon naming fixes and designDominik Schürmann2015-03-0423-56/+69
| | | | | | | |
* | | | | | | | Partially fix file namesDominik Schürmann2015-03-04158-13/+13
| | | | | | | |
* | | | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-0455-781/+82
| | | | | | | |
* | | | | | | | Update lib listDominik Schürmann2015-03-041-7/+9
| | | | | | | |
* | | | | | | | Get high res version of contact photoDominik Schürmann2015-03-043-6/+7
| | | | | | | |
* | | | | | | | Crop image view to centerDominik Schürmann2015-03-042-7/+6
| | | | | | | |
* | | | | | | | Full height contact pic in key viewDominik Schürmann2015-03-042-8/+8
| | | | | | | |
* | | | | | | | ContactHelper cleanupDominik Schürmann2015-03-042-34/+41
| | | | | | | |
* | | | | | | | Use master key id instead of fingerprint in sync adapter, use IS_EXPIRED ↵Dominik Schürmann2015-03-049-119/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of EXPIRY where possible
* | | | | | | | Fix status bar orangeDominik Schürmann2015-03-041-1/+1
| | | | | | | |
* | | | | | | | More simplification of delete stringsDominik Schürmann2015-03-041-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #1097 from ishan1604/orange-toolbarDominik Schürmann2015-03-043-2/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Orange toolbar for certify and fingerprint activity added
| * | | | | | | | Orange Toolbar Added Fixes #1088Ishan Khanna2015-03-045-44/+33
| | | | | | | | |
| * | | | | | | | Fixes Issue#1088Ishan Khanna2015-03-042-0/+42
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Simplify certify stringsDominik Schürmann2015-03-041-11/+2
| | | | | | | |
* | | | | | | | 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 'development' of https://github.com/vectorijk/open-keychain ↵Dominik Schürmann2015-03-03246-42/+42
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vectorijk-development
| * | | | | | | | | 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
| | | | | | | | | |
* | | | | | | | | | Show name only in passphrase dialogDominik Schürmann2015-03-032-1/+25
| | | | | | | | | |
* | | | | | | | | | 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-031-2/+0
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 21:56:16 +0000