aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Improve way of getting possible names by filtering out emailsDominik Schürmann2015-03-061-1/+25
| | | | | | |
* | | | | | | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-065-84/+216
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | development
| * | | | | | Added GPLv3 Licensechipset952015-03-062-0/+34
| | | | | | |
| * | | | | | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-065-84/+182
| | | | | | |
* | | | | | | Fix elevationDominik Schürmann2015-03-061-2/+2
|/ / / / / /
* | | | | | Format code of merged password strength widgetDominik Schürmann2015-03-052-40/+49
| | | | | |
* | | | | | Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into ↵Dominik Schürmann2015-03-054-0/+496
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passphrase-strength-indicator Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
| * | | | | | Integrates passphrase strength indicator to create key wizard.Lukas Zorich2015-03-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit patches issue #1050. The padding set in the passphrase edit text is set programmatically because there is a bug in appcompat-v7 where padding via xml doesn't work: http://code.google.com/p/android/issues/detail?id=77982
| * | | | | | Add license to password strength view classesLukas Zorich2015-03-033-0/+68
| | | | | | |
| * | | | | | Implemented Matt Allen password strength indicatorLukas Zorich2015-03-032-0/+420
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I used most of Matt Allen password strength indicator code available here https://github.com/matt-allen/android-password-strength-indicator, but modified it a little bit in order to customize the view's colors through the xml.
* | | | | | Use ArrayList instead of LinkedListDominik Schürmann2015-03-055-11/+13
| | | | | |
* | | | | | Cleanup of PgpConstantsDominik Schürmann2015-03-051-24/+22
| | | | | |
* | | | | | Add missing headerDominik Schürmann2015-03-051-0/+17
| | | | | |
* | | | | | Check for insecure hash and symmetric encryption algos on decryptDominik Schürmann2015-03-052-0/+32
| | | | | |
* | | | | | Use static linked lists instead of arraysDominik Schürmann2015-03-056-35/+53
| | | | | |
* | | | | | Add missing file with PGP ConstantsDominik Schürmann2015-03-051-0/+69
| | | | | |
* | | | | | Remove advanced preferences, move compression as menu item in encrypt ↵Dominik Schürmann2015-03-0514-433/+101
| | | | | | | | | | | | | | | | | | | | | | | | activites, select hash and encryption algo based on hardcoded preferred lists
* | | | | | Remove preferences multi process min sdk checkDominik Schürmann2015-03-051-6/+2
| | | | | |
* | | | | | Remove false comment in list fragmentDominik Schürmann2015-03-051-3/+0
| | | | | |
* | | | | | Debug optionsDominik Schürmann2015-03-053-2/+6
| | | | | |
* | | | | | Design fixes for decryption screenDominik Schürmann2015-03-051-1/+1
| | | | | |
* | | | | | Use no compression in API for nowDominik Schürmann2015-03-051-1/+2
| | | | | |
* | | | | | 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
* | | | | Show fingerprint menu item only if not revoked or expiredDominik Schürmann2015-03-041-9/+12
| | | | |
* | | | | Merge branch 'development' of https://github.com/adithyaphilip/open-keychain ↵Dominik Schürmann2015-03-042-2/+203
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-7/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into development
| * | | | | | supports sub logs in log exportAdithya Abraham Philip2015-03-011-68/+55
| | | | | | |
| * | | | | | added logging, notify for log exportAdithya Abraham Philip2015-03-012-20/+59
| | | | | | |
| * | | | | | 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-2815-380/+375
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2824-463/+1033
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into development
| * | | | | | | | | refined log outputAdithya Abraham Philip2015-02-281-4/+71
| | | | | | | | | |
| * | | | | | | | | merged dialogAdithya Abraham Philip2015-02-2644-1603/+1931
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | initial Log Display functionAdithya Abraham Philip2015-02-261-0/+102
| | | | | | | | | | |
* | | | | | | | | | | Set key signature algo from SHA512 to SHA256Dominik Schürmann2015-03-041-9/+10
| | | | | | | | | | |
* | | | | | | | | | | More icon naming fixes and designDominik Schürmann2015-03-042-16/+16
| | | | | | | | | | |
* | | | | | | | | | | Simplified language: Confirm keysDominik Schürmann2015-03-042-17/+8
| | | | | | | | | | |
* | | | | | | | | | | Get high res version of contact photoDominik Schürmann2015-03-043-6/+7
| | | | | | | | | | |
* | | | | | | | | | | Crop image view to centerDominik Schürmann2015-03-041-3/+2
| | | | | | | | | | |
* | | | | | | | | | | Full height contact pic in key viewDominik Schürmann2015-03-041-7/+1
| | | | | | | | | | |
* | | | | | | | | | | 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
* | | | | | | | | | | Simplify dialogs according to Material DesignDominik Schürmann2015-03-042-13/+9
| | | | | | | | | | |
* | | | | | | | | | | 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..