aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Redesign of encrypt activites finishedDominik Schürmann2015-03-0916-172/+140
|
* Improve iconsDominik Schürmann2015-03-0916-7/+7
|
* Fix padding in create keyDominik Schürmann2015-03-091-0/+2
|
* Removed unused PasswordEditTextDominik Schürmann2015-03-091-101/+0
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-0911-109/+242
|\ | | | | | | development
| * Merge pull request #1111 from adithyaphilip/passphrase-strength-indicatorDominik Schürmann2015-03-096-90/+140
| |\ | | | | | | Passphrase strength indicator
| | * minor xml code style correctionAdithya Abraham Philip2015-03-081-8/+8
| | |
| | * 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-063-52/+38
| | |
| | * changed default colors for PasswordStrengthViewAdithya Abraham Philip2015-03-062-8/+6
| | |
| | * added PassphraseEditText to SetPassphraseDialogFragmentAdithya Abraham Philip2015-03-063-6/+6
| | |
| | * added PassphraseEditTextAdithya Abraham Philip2015-03-063-31/+92
| | |
| * | add support for certification of user attributesVincent Breitmoser2015-03-085-19/+102
| |/
* | 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-068-101/+249
|\| | | | | | | | | | | development
| * | Added GPLv3 Licensechipset952015-03-062-0/+34
| | |
| * | Created EmailEditText, PasswordEditText and implemented wherever requiredchipset952015-03-068-101/+215
| | |
* | | Tryout design for encrypt, decryptDominik Schürmann2015-03-0628-7/+76
| | |
* | | Fix elevationDominik Schürmann2015-03-067-106/+78
|/ /
* | 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-056-8/+536
|\ \ | | | | | | | | | | | | | | | | | | 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-032-18/+31
| | | | | | | | | | | | | | | | | | | | | | | | 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-034-1/+80
| | |
| * | Implemented Matt Allen password strength indicatorLukas Zorich2015-03-033-0/+434
| | | | | | | | | | | | | | | | | | | | | 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-053-0/+34
| | |
* | | 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-0519-484/+134
| | | | | | | | | | | | 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-0513-3/+3
| | |
* | | 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
* | | | 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