aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Collapse)AuthorAgeFilesLines
* Removed unused PasswordEditTextDominik Schürmann2015-03-091-101/+0
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-098-81/+228
|\ | | | | | | development
| * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-094-64/+131
| |\ | | | | | | Passphrase strength indicator
| | * minor code style correctionAdithya Abraham Philip2015-03-073-2/+10
| | |
| | * removed created by commentAdithya Abraham Philip2015-03-061-3/+0
| | |
| | * cleaned up codeAdithya Abraham Philip2015-03-062-52/+37
| | |
| | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-061-3/+5
| | |
| | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-062-5/+5
| | |
| | * added PassphraseEditTextAdithya Abraham Philip2015-03-062-14/+89
| | |
| * | add support for certification of user attributesVincent Breitmoser2015-03-084-17/+97
| |/
* | Remove dublicate email checkDominik Schürmann2015-03-061-3/+1
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-061-38/+74
|\| | | | | | | development
| * Merge pull request #1108 from tdjogi010/developmentVincent2015-03-061-38/+74
| |\ | | | | | | Asks Passphrase for key delete/export in ViewKeyActivity.
| | * Asks Passphrase for key delete/export in ViewKeyActivity.tdjogi010@gmail.com2015-03-061-38/+74
| | |
* | | 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
| | | | | | |